Merge branch '2.2' into develop

2018-09-12 22:14:56 +03:00
parent 12092d1a90 e1f2b81734
commit 7ec2f77708
21 changed files with 254 additions and 105 deletions
--- a/server/core/internal/monitor.h
+++ b/server/core/internal/monitor.h
@ -23,9 +23,9 @@ MXS_BEGIN_DECLS

 #define MON_ARG_MAX 8192

-#define DEFAULT_CONNECT_TIMEOUT 3
-#define DEFAULT_READ_TIMEOUT 3
-#define DEFAULT_WRITE_TIMEOUT 3
+#define DEFAULT_CONNECT_TIMEOUT     3
+#define DEFAULT_READ_TIMEOUT        3
+#define DEFAULT_WRITE_TIMEOUT       3
 #define DEFAULT_CONNECTION_ATTEMPTS 1

 #define DEFAULT_MONITOR_INTERVAL 2000   // in milliseconds