diff options
| author | Michael Klishin <mklishin@pivotal.io> | 2016-11-10 19:44:44 +0300 |
|---|---|---|
| committer | Michael Klishin <mklishin@pivotal.io> | 2016-11-10 19:44:44 +0300 |
| commit | 634bda9a4ddb156a1654b9eb912dba9afc6be411 (patch) | |
| tree | e34bdcc0ed1faf122f34b7a336a4d9ff79615f1d | |
| parent | 16b46a3ac0de91b75291eb48d63f0bbca8abc913 (diff) | |
| parent | 5c6d8e523349bb7df418cfff52b99f173a7cc4c1 (diff) | |
| download | rabbitmq-server-git-634bda9a4ddb156a1654b9eb912dba9afc6be411.tar.gz | |
Merge branch 'master' into rabbitmq-server-988
| -rw-r--r-- | src/rabbit.erl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/rabbit.erl b/src/rabbit.erl index 4b12e20b47..c5f856df91 100644 --- a/src/rabbit.erl +++ b/src/rabbit.erl @@ -19,7 +19,7 @@ -behaviour(application). -export([start/0, boot/0, stop/0, - stop_and_halt/0, await_startup/0, status/0, is_running/0, + stop_and_halt/0, await_startup/0, status/0, is_running/0, alarms/0, is_running/1, environment/0, rotate_logs/0, force_event_refresh/1, start_fhc/0]). -export([start/2, stop/1, prep_stop/1]). |