Merge branch 'master' into upstream-merge-32096

2017-10-29 01:49:22 -04:00
parent 71dd5e8e2e 6a5b3b278e
commit 3b91f4efcc
21 changed files with 1015 additions and 981 deletions
@@ -46,8 +46,8 @@
 #define INIT_ORDER_DBCORE 18
 #define INIT_ORDER_BLACKBOX 17
 #define INIT_ORDER_SERVER_MAINT 16
-#define INIT_ORDER_JOBS 15
-#define INIT_ORDER_EVENTS 14
+#define INIT_ORDER_EVENTS 15
+#define INIT_ORDER_JOBS 14
 #define INIT_ORDER_TICKER 13
 #define INIT_ORDER_MAPPING 12
 #define INIT_ORDER_ATOMS 11