root
/
rabbitmq-server
mirror of https://github.com/rabbitmq/rabbitmq-server.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'stable' into rabbitmq-management-236

This commit is contained in:
Jean-Sébastien Pédron 2016-11-24 12:13:28 +01:00
parent 6e960c0706 1164d005cf
commit 8d00a5b666
3 changed files with 428 additions and 307 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
deps/rabbitmq_web_mqtt/Makefile vendored
View File

@ -1,7 +1,7 @@
PROJECT = rabbitmq_web_mqtt PROJECT = rabbitmq_web_mqtt
DEPS = rabbit_common rabbit cowboy rabbitmq_mqtt DEPS = rabbit_common rabbit cowboy rabbitmq_mqtt
TEST_DEPS = rabbitmq_ct_helpers TEST_DEPS = rabbitmq_ct_helpers rabbitmq_ct_client_helpers
dep_cowboy_commit = 1.0.3 dep_cowboy_commit = 1.0.3
# FIXME: Add Ranch as a BUILD_DEPS to be sure the correct version is picked. # FIXME: Add Ranch as a BUILD_DEPS to be sure the correct version is picked.

729
deps/rabbitmq_web_mqtt/erlang.mk vendored
View File

File diff suppressed because it is too large Load Diff

4
deps/rabbitmq_web_mqtt/rabbitmq-components.mk vendored
View File

@ -26,8 +26,10 @@ dep_rabbitmq_auth_backend_ldap = git_rmq rabbitmq-auth-backend-ldap $(cur
dep_rabbitmq_auth_mechanism_ssl = git_rmq rabbitmq-auth-mechanism-ssl $(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
dep_rabbitmq_boot_steps_visualiser = git_rmq rabbitmq-boot-steps-visualiser $(current_rmq_ref) $(base_rmq_ref) master dep_rabbitmq_boot_steps_visualiser = git_rmq rabbitmq-boot-steps-visualiser $(current_rmq_ref) $(base_rmq_ref) master
dep_rabbitmq_clusterer = git_rmq rabbitmq-clusterer $(current_rmq_ref) $(base_rmq_ref) master dep_rabbitmq_clusterer = git_rmq rabbitmq-clusterer $(current_rmq_ref) $(base_rmq_ref) master
dep_rabbitmq_cli = git_rmq rabbitmq-cli $(current_rmq_ref) $(base_rmq_ref) master
dep_rabbitmq_codegen = git_rmq rabbitmq-codegen $(current_rmq_ref) $(base_rmq_ref) master dep_rabbitmq_codegen = git_rmq rabbitmq-codegen $(current_rmq_ref) $(base_rmq_ref) master
dep_rabbitmq_consistent_hash_exchange = git_rmq rabbitmq-consistent-hash-exchange $(current_rmq_ref) $(base_rmq_ref) master dep_rabbitmq_consistent_hash_exchange = git_rmq rabbitmq-consistent-hash-exchange $(current_rmq_ref) $(base_rmq_ref) master
dep_rabbitmq_ct_client_helpers = git_rmq rabbitmq-ct-client-helpers $(current_rmq_ref) $(base_rmq_ref) master
dep_rabbitmq_ct_helpers = git_rmq rabbitmq-ct-helpers $(current_rmq_ref) $(base_rmq_ref) master dep_rabbitmq_ct_helpers = git_rmq rabbitmq-ct-helpers $(current_rmq_ref) $(base_rmq_ref) master
dep_rabbitmq_delayed_message_exchange = git_rmq rabbitmq-delayed-message-exchange $(current_rmq_ref) $(base_rmq_ref) master dep_rabbitmq_delayed_message_exchange = git_rmq rabbitmq-delayed-message-exchange $(current_rmq_ref) $(base_rmq_ref) master
dep_rabbitmq_dotnet_client = git_rmq rabbitmq-dotnet-client $(current_rmq_ref) $(base_rmq_ref) master dep_rabbitmq_dotnet_client = git_rmq rabbitmq-dotnet-client $(current_rmq_ref) $(base_rmq_ref) master
@ -88,8 +90,10 @@ RABBITMQ_COMPONENTS = amqp_client \
rabbitmq_auth_mechanism_ssl \ rabbitmq_auth_mechanism_ssl \
rabbitmq_boot_steps_visualiser \ rabbitmq_boot_steps_visualiser \
rabbitmq_clusterer \ rabbitmq_clusterer \
rabbitmq_cli \
rabbitmq_codegen \ rabbitmq_codegen \
rabbitmq_consistent_hash_exchange \ rabbitmq_consistent_hash_exchange \
rabbitmq_ct_client_helpers \
rabbitmq_ct_helpers \ rabbitmq_ct_helpers \
rabbitmq_delayed_message_exchange \ rabbitmq_delayed_message_exchange \
rabbitmq_dotnet_client \ rabbitmq_dotnet_client \