diff options
| author | Michael Klishin <mklishin@pivotal.io> | 2016-08-18 12:17:34 +0300 |
|---|---|---|
| committer | Michael Klishin <mklishin@pivotal.io> | 2016-08-18 12:17:34 +0300 |
| commit | 754feab6936ff1954964bf04423a2758899b91dc (patch) | |
| tree | d4d72c1ef7e84d994c52805a955e38d6967efd99 /include | |
| parent | dad8511a6409816d3d8012fdb70213122bb690e4 (diff) | |
| parent | 9f1c12f8ab553aab2da435f82a805da8b08c9149 (diff) | |
| download | rabbitmq-server-git-754feab6936ff1954964bf04423a2758899b91dc.tar.gz | |
Merge branch 'master' into rabbitmq-server-500-squashed
Conflicts:
src/rabbit_control_main.erl
Diffstat (limited to 'include')
| -rw-r--r-- | include/rabbit_cli.hrl | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/rabbit_cli.hrl b/include/rabbit_cli.hrl index 0e338855cd..19cae2fc0a 100644 --- a/include/rabbit_cli.hrl +++ b/include/rabbit_cli.hrl @@ -29,6 +29,7 @@ -define(RAM_OPT, "--ram"). -define(OFFLINE_OPT, "--offline"). -define(ONLINE_OPT, "--online"). +-define(LOCAL_OPT, "--local"). -define(NODE_DEF(Node), {?NODE_OPT, {option, Node}}). -define(QUIET_DEF, {?QUIET_OPT, flag}). @@ -45,6 +46,7 @@ -define(RAM_DEF, {?RAM_OPT, flag}). -define(OFFLINE_DEF, {?OFFLINE_OPT, flag}). -define(ONLINE_DEF, {?ONLINE_OPT, flag}). +-define(LOCAL_DEF, {?LOCAL_OPT, flag}). %% Subset of standartized exit codes from sysexits.h, see %% https://github.com/rabbitmq/rabbitmq-server/issues/396 for discussion. |