diff options
| author | Arnaud Cogoluègnes <acogoluegnes@gmail.com> | 2017-01-31 17:14:18 +0100 |
|---|---|---|
| committer | Arnaud Cogoluègnes <acogoluegnes@gmail.com> | 2017-01-31 17:14:18 +0100 |
| commit | e06ad9811621e4f44ebedc6893968924745b4d85 (patch) | |
| tree | ff22d190b53675aab14fdf1ba0da4f1afc187c78 | |
| parent | 41394d3cc9f2aa28f213dd75ebf2d64a9a7d37a6 (diff) | |
| parent | 22a756fd8c10f317590a43754548df3192cf3701 (diff) | |
| download | rabbitmq-server-git-e06ad9811621e4f44ebedc6893968924745b4d85.tar.gz | |
Merge branch 'master' into rabbitmq-server-1085
| -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 \ |