hcq/MaxScale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch '2.2' into develop

Browse Source
This commit is contained in:
Johan Wikman
2018-03-13 13:35:19 +02:00
parent dad6a4f9bf ff13fa633e
commit 4ce4c0b4c7
1 changed files with 14 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
maxscale-system-test/.gitignore vendored
View File

@ -89,9 +89,11 @@ delete_rds
different_size_binlog different_size_binlog
different_size_rwsplit different_size_rwsplit
encrypted_passwords encrypted_passwords
failover_mysqlmon
false_monitor_state_change false_monitor_state_change
fwf fwf
fwf2 fwf2
fwf_MXS-1583
fwf_actions fwf_actions
fwf_com_ping fwf_com_ping
fwf_duplicate_rules fwf_duplicate_rules
@ -99,8 +101,10 @@ fwf_logging
fwf_prepared_stmt fwf_prepared_stmt
fwf_reload fwf_reload
fwf_syntax fwf_syntax
fwf_users
galera_priority galera_priority
include/ include/
keepalived
kerberos_setup kerberos_setup
kill_master kill_master
large_insert_hang large_insert_hang
@ -110,6 +114,7 @@ local_address
long_sysbench long_sysbench
longblob longblob
lots_of_rows lots_of_rows
maxctrl_basic
max_connections max_connections
maxscale_process_user maxscale_process_user
mm mm
@ -144,7 +149,15 @@ mxs1457_ignore_deleted
mxs1468 mxs1468
mxs1476 mxs1476
mxs1509 mxs1509
mxs1516
mxs1542
mxs1543
mxs1583_fwf mxs1583_fwf
mxs1585
mxs1643_extra_events
mxs1653_ps_hang
mxs1677_temp_table
mxs1678_relay_master
mxs244_prepared_stmt_loop mxs244_prepared_stmt_loop
mxs280_select_outfile mxs280_select_outfile
mxs314 mxs314
@ -180,6 +193,7 @@ mxs922_scaling
mxs922_server mxs922_server
mxs951_utfmb4 mxs951_utfmb4
mxs957 mxs957
mysqlmon_external_master
mysqlmon_failover_auto mysqlmon_failover_auto
mysqlmon_failover_manual mysqlmon_failover_manual
mysqlmon_rejoin_good mysqlmon_rejoin_good