Merge branch 'stable'

Author: dumbbell

rabbitmq-components.mk

@@ -11,7 +11,7 @@ endif
 #   3. a version based on git-describe(1), if it is a Git clone;
 #   4. 0.0.0
 
-PROJECT_VERSION = $(RABBITMQ_VERSION)
+PROJECT_VERSION := $(RABBITMQ_VERSION)
 
 ifeq ($(PROJECT_VERSION),)
 PROJECT_VERSION := $(shell \

test/metrics_SUITE.erl

@@ -366,7 +366,7 @@ ensure_channel_queue_metrics_populated(Chan, Queue) ->
 
 force_channel_stats(Config) ->
     [ Pid ! emit_stats || {Pid, _} <- read_table_rpc(Config, channel_created) ],
-    timer:sleep(10).
+    timer:sleep(100).
 
 read_table_rpc(Config, Table) ->
     rabbit_ct_broker_helpers:rpc(Config, 0, ?MODULE, read_table, [Table]).