Merge branch 'stable'

rabbitmq · May 16, 2017 · 343b540 · 343b540
2 parents 955877b + f02b5de
commit 343b540
Show file tree

Hide file tree

Showing 2 changed files with 232 additions and 149 deletions.
diff --git a/Makefile b/Makefile
@@ -36,6 +36,7 @@ DEPS = rabbit_common rabbit
 TEST_DEPS = ct_helper rabbitmq_ct_helpers rabbitmq_ct_client_helpers amqp_client
 dep_ct_helper = git https://github.com/extend/ct_helper.git master
 
+DEP_EARLY_PLUGINS = rabbit_common/mk/rabbitmq-early-plugin.mk
 DEP_PLUGINS = rabbit_common/mk/rabbitmq-plugin.mk
 
 # FIXME: Use erlang.mk patched for RabbitMQ, while waiting for PRs to be