diff options
| author | Arnaud Cogoluègnes <acogoluegnes@gmail.com> | 2017-02-07 11:11:25 +0100 |
|---|---|---|
| committer | Arnaud Cogoluègnes <acogoluegnes@gmail.com> | 2017-02-07 11:11:25 +0100 |
| commit | 678dcd91c28a939b612e5945b92fe130a1011df2 (patch) | |
| tree | cf83502908eb59160054497199a1ea7c0dd03f5f /rabbitmq-components.mk | |
| parent | ac29fabdefd1887b27014814589c2bbd4ec903b7 (diff) | |
| parent | 9280ea6c5c33245831a295edb4fb72ee775cf681 (diff) | |
| download | rabbitmq-server-git-678dcd91c28a939b612e5945b92fe130a1011df2.tar.gz | |
Merge branch 'master' into rabbitmq-server-589
Conflicts:
Makefile
Diffstat (limited to 'rabbitmq-components.mk')
| -rw-r--r-- | rabbitmq-components.mk | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/rabbitmq-components.mk b/rabbitmq-components.mk index 3dbd6af30d..a5d4292d78 100644 --- a/rabbitmq-components.mk +++ b/rabbitmq-components.mk @@ -42,6 +42,7 @@ dep_rabbit = git_rmq rabbitmq-server $(current_rmq_re dep_rabbit_common = git_rmq rabbitmq-common $(current_rmq_ref) $(base_rmq_ref) master dep_rabbitmq_amqp1_0 = git_rmq rabbitmq-amqp1.0 $(current_rmq_ref) $(base_rmq_ref) master dep_rabbitmq_auth_backend_amqp = git_rmq rabbitmq-auth-backend-amqp $(current_rmq_ref) $(base_rmq_ref) master +dep_rabbitmq_auth_backend_cache = git_rmq rabbitmq-auth-backend-cache $(current_rmq_ref) $(base_rmq_ref) master dep_rabbitmq_auth_backend_http = git_rmq rabbitmq-auth-backend-http $(current_rmq_ref) $(base_rmq_ref) master dep_rabbitmq_auth_backend_ldap = git_rmq rabbitmq-auth-backend-ldap $(current_rmq_ref) $(base_rmq_ref) master dep_rabbitmq_auth_mechanism_ssl = git_rmq rabbitmq-auth-mechanism-ssl $(current_rmq_ref) $(base_rmq_ref) master @@ -100,7 +101,7 @@ 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.4 +dep_cowboy_commit = 1.1.0 dep_mochiweb = git git://github.com/basho/mochiweb.git v2.9.0p2 dep_ranch_commit = 1.3.1 dep_webmachine_commit = 1.10.8p2 @@ -110,6 +111,7 @@ RABBITMQ_COMPONENTS = amqp_client \ rabbit_common \ rabbitmq_amqp1_0 \ rabbitmq_auth_backend_amqp \ + rabbitmq_auth_backend_cache \ rabbitmq_auth_backend_http \ rabbitmq_auth_backend_ldap \ rabbitmq_auth_mechanism_ssl \ |