Merge remote-tracking branch 'origin/develop'

emqx · Mar 22, 2019 · eff1391 · eff1391
2 parents 4190f2e + 4f57c0c
commit eff1391
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 1 deletion.
diff --git a/Makefile b/Makefile
@@ -19,7 +19,7 @@ MAIN_APPS = emqx emqx-retainer emqx-recon emqx-management \
             emqx-auth-clientid emqx-auth-username emqx-auth-http \
             emqx-auth-mysql emqx-reloader \
             emqx-sn emqx-coap emqx-stomp emqx-web-hook \
-            emqx-auth-jwt emqx-delayed-publish emqx-psk-file
+            emqx-auth-jwt emqx-delayed-publish emqx-psk-file emqx-rule-engine
 
 CLOUD_APPS = emqx-lwm2m emqx-dashboard emqx-auth-ldap emqx-auth-pgsql emqx-auth-redis emqx-auth-mongo emqx-plugin-template emqx-statsd emqx-lua-hook
 

diff --git a/data/loaded_plugins b/data/loaded_plugins
@@ -1,4 +1,5 @@
 emqx_management.
+emqx_rule_engine.
 emqx_recon.
 emqx_retainer.
 emqx_dashboard.
diff --git a/relx.config b/relx.config
@@ -23,6 +23,8 @@
   cowboy,
   pbkdf2,
   bcrypt,
+  sqlparse,
+  jpparse,
   emqx,
   {mnesia, load},
   {ekka, load},
@@ -33,6 +35,7 @@
   {emqx_stomp, load},
   {emqx_statsd, load},
   {emqx_management, load},
+  {emqx_rule_engine, load},
   {emqx_retainer, load},
   {emqx_reloader, load},
   {emqx_dashboard, load},

diff --git a/relx.config.edge b/relx.config.edge
@@ -20,6 +20,8 @@
   cowboy,
   pbkdf2,
   bcrypt,
+  sqlparse,
+  jpparse,
   emqx,
   {mnesia, load},
   {ekka, load},
@@ -29,6 +31,7 @@
   {emqx_stomp, load},
   {emqx_management, load},
   {emqx_retainer, load},
+  {emqx_rule_engine, load},
   {emqx_reloader, load},
   {emqx_delayed_publish, load},
   {emqx_web_hook, load},