diff options
| author | Michael Klishin <mklishin@pivotal.io> | 2017-02-01 15:42:25 +0300 |
|---|---|---|
| committer | Michael Klishin <mklishin@pivotal.io> | 2017-02-01 15:42:25 +0300 |
| commit | f4f8c58e72f39c2181e8293bff8f9d995a88b1a3 (patch) | |
| tree | 90a3f0455534e0dda35ae19deb4685909e936578 | |
| parent | 40cdcf956c602666b476061e5d1621ccbdf342c3 (diff) | |
| parent | 22a756fd8c10f317590a43754548df3192cf3701 (diff) | |
| download | rabbitmq-server-git-f4f8c58e72f39c2181e8293bff8f9d995a88b1a3.tar.gz | |
merge branch 'master'
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | rabbitmq-components.mk | 2 |
2 files changed, 2 insertions, 2 deletions
@@ -144,8 +144,8 @@ copy-escripts: DEP_PLUGINS = rabbit_common/mk/rabbitmq-build.mk \ - rabbit_common/mk/rabbitmq-run.mk \ rabbit_common/mk/rabbitmq-dist.mk \ + rabbit_common/mk/rabbitmq-run.mk \ rabbit_common/mk/rabbitmq-tools.mk # FIXME: Use erlang.mk patched for RabbitMQ, while waiting for PRs to be diff --git a/rabbitmq-components.mk b/rabbitmq-components.mk index c05a66fe13..3dbd6af30d 100644 --- a/rabbitmq-components.mk +++ b/rabbitmq-components.mk @@ -102,7 +102,7 @@ dep_rabbitmq_public_umbrella = git_rmq rabbitmq-public-umbrella $(curre dep_cowboy_commit = 1.0.4 dep_mochiweb = git git://github.com/basho/mochiweb.git v2.9.0p2 -dep_ranch_commit = 1.3.0 +dep_ranch_commit = 1.3.1 dep_webmachine_commit = 1.10.8p2 RABBITMQ_COMPONENTS = amqp_client \ |