diff options
| author | Michael Klishin <mklishin@pivotal.io> | 2016-09-15 17:55:38 +0300 |
|---|---|---|
| committer | Michael Klishin <mklishin@pivotal.io> | 2016-09-15 17:55:38 +0300 |
| commit | d64eb05f2473440e14b19b5b01b247f19389ff4e (patch) | |
| tree | 4a04bae837b9b7d63e8ddafee41a9c30cbfadf9b | |
| parent | bb827dd81e5912a307bee0b40acaf8e343ad383d (diff) | |
| parent | 98e271fbe6fbcda4610c78dbbeff14fc9c3a32ff (diff) | |
| download | rabbitmq-server-git-d64eb05f2473440e14b19b5b01b247f19389ff4e.tar.gz | |
Merge branch 'stable' into rabbitmq-server-953
| -rw-r--r-- | rabbitmq-components.mk | 17 | ||||
| -rw-r--r-- | src/rabbit_autoheal.erl | 2 |
2 files changed, 3 insertions, 16 deletions
diff --git a/rabbitmq-components.mk b/rabbitmq-components.mk index e3417856f8..dbad95d738 100644 --- a/rabbitmq-components.mk +++ b/rabbitmq-components.mk @@ -38,6 +38,7 @@ dep_rabbitmq_boot_steps_visualiser = git_rmq rabbitmq-boot-steps-visualiser $ dep_rabbitmq_clusterer = git_rmq rabbitmq-clusterer $(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_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_dotnet_client = git_rmq rabbitmq-dotnet-client $(current_rmq_ref) $(base_rmq_ref) master dep_rabbitmq_event_exchange = git_rmq rabbitmq-event-exchange $(current_rmq_ref) $(base_rmq_ref) master @@ -98,6 +99,7 @@ RABBITMQ_COMPONENTS = amqp_client \ rabbitmq_clusterer \ rabbitmq_codegen \ rabbitmq_consistent_hash_exchange \ + rabbitmq_ct_helpers \ rabbitmq_delayed_message_exchange \ rabbitmq_dotnet_client \ rabbitmq_event_exchange \ @@ -285,16 +287,6 @@ endif # rabbitmq-components.mk checks. # -------------------------------------------------------------------- -ifeq ($(PROJECT),rabbit_common) -else ifdef SKIP_RMQCOMP_CHECK -else ifeq ($(IS_DEP),1) -else ifneq ($(filter co up,$(MAKECMDGOALS)),) -else -# In all other cases, rabbitmq-components.mk must be in sync. -deps:: check-rabbitmq-components.mk -fetch-deps: check-rabbitmq-components.mk -endif - # If this project is under the Umbrella project, we override $(DEPS_DIR) # to point to the Umbrella's one. We also disable `make distclean` so # $(DEPS_DIR) is not accidentally removed. @@ -308,11 +300,6 @@ endif ifeq ($(UNDER_UMBRELLA),1) ifneq ($(PROJECT),rabbitmq_public_umbrella) DEPS_DIR ?= $(abspath ..) - -distclean:: distclean-components - @: - -distclean-components: endif ifneq ($(filter distclean distclean-deps,$(MAKECMDGOALS)),) diff --git a/src/rabbit_autoheal.erl b/src/rabbit_autoheal.erl index 9d6bfff5fc..3adcc09692 100644 --- a/src/rabbit_autoheal.erl +++ b/src/rabbit_autoheal.erl @@ -245,7 +245,7 @@ handle_msg({become_winner, _}, %% Something has happened to the leader, it might have seen us down but we %% are still alive. Partitions have changed, cannot continue. rabbit_log:info("Autoheal: I am the winner and received another healing " - "request, partitions have changed. Aborting ~n", [Losers]), + "request, partitions have changed to ~p. Aborting ~n", [Losers]), winner_finish(Losers), not_healing; |