diff options
| author | Jean-Sébastien Pédron <jean-sebastien@rabbitmq.com> | 2016-12-09 19:17:39 +0100 |
|---|---|---|
| committer | Jean-Sébastien Pédron <jean-sebastien@rabbitmq.com> | 2016-12-09 19:17:39 +0100 |
| commit | 59fcbd90cd48d89ab69231cef2a61ea8f81f02e3 (patch) | |
| tree | e9f99b3eebef96ceb848d92218abd7c9f21cb8e5 | |
| parent | bd67bc3669ce588c05be8999dbd86e54c7ee8a7d (diff) | |
| parent | 4d3d1705e835e2bad9b82ff10bbaee6f8130a2a9 (diff) | |
| download | rabbitmq-server-git-59fcbd90cd48d89ab69231cef2a61ea8f81f02e3.tar.gz | |
Merge branch 'stable'rabbitmq_v3_7_0_milestone8
| -rw-r--r-- | rabbitmq-components.mk | 2 | ||||
| -rw-r--r-- | test/metrics_SUITE.erl | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/rabbitmq-components.mk b/rabbitmq-components.mk index 7f168d029a..c05a66fe13 100644 --- a/rabbitmq-components.mk +++ b/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 \ diff --git a/test/metrics_SUITE.erl b/test/metrics_SUITE.erl index c70a7dc61f..b2b0fe3560 100644 --- a/test/metrics_SUITE.erl +++ b/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]). |