diff options
| author | Gerhard Lazu <gerhard@rabbitmq.com> | 2016-11-30 17:37:05 +0000 |
|---|---|---|
| committer | Gerhard Lazu <gerhard@rabbitmq.com> | 2016-11-30 17:39:42 +0000 |
| commit | 3b7c05c8db27f19e993e5fc230954e3707af46bd (patch) | |
| tree | 31e4242eb6be78cda0fb97c1ce34df8d3c28d981 /rabbitmq-components.mk | |
| parent | 4ca5396b5d77b39a6de518c7ae580d1591ae2b84 (diff) | |
| parent | c2160877085bf4755cac3a2338695597c136523f (diff) | |
| download | rabbitmq-server-git-3b7c05c8db27f19e993e5fc230954e3707af46bd.tar.gz | |
Merge branch 'stable' into rabbitmq-server-1033
Conflicts:
rabbitmq-components.mk
Diffstat (limited to 'rabbitmq-components.mk')
| -rw-r--r-- | rabbitmq-components.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/rabbitmq-components.mk b/rabbitmq-components.mk index 071385e8e7..ff2b1963ed 100644 --- a/rabbitmq-components.mk +++ b/rabbitmq-components.mk @@ -79,9 +79,9 @@ dep_rabbitmq_public_umbrella = git_rmq rabbitmq-public-umbrella $(curre # all projects use the same versions. It avoids conflicts and makes it # possible to work with rabbitmq-public-umbrella. -dep_cowboy_commit = 1.0.3 +dep_cowboy_commit = 1.0.4 dep_mochiweb = git git://github.com/basho/mochiweb.git v2.9.0p2 -dep_ranch_commit = 1.2.1 +dep_ranch_commit = 1.3.0 dep_webmachine_commit = 1.10.8p2 RABBITMQ_COMPONENTS = amqp_client \ |