summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRussell Bryant <russell@russellbryant.com>2010-11-10 14:15:53 +0000
committerRussell Bryant <russell@russellbryant.com>2010-11-10 14:15:53 +0000
commit2a0983d0c555fce3ffbbb6b7f8510976e2864cbe (patch)
tree6ef0430a5eba87424826e9252d1ae34af33400ee
parent8de561a79a56c033c1a426d3c86ac9b9968a0b48 (diff)
Merged revisions 294535 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8 ........ r294535 | russell | 2010-11-10 08:14:51 -0600 (Wed, 10 Nov 2010) | 5 lines Tweak a couple of CLI commands back to their original form. The "module" in this case is two parts, so there are two words before the verb of the CLI command. ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@294536 65c4cc65-6c06-0410-ace0-fbb531ad65f3
-rw-r--r--UPGRADE-1.8.txt4
-rw-r--r--res/ais/clm.c4
-rw-r--r--res/ais/evt.c4
3 files changed, 8 insertions, 4 deletions
diff --git a/UPGRADE-1.8.txt b/UPGRADE-1.8.txt
index da1362554..e9bee24de 100644
--- a/UPGRADE-1.8.txt
+++ b/UPGRADE-1.8.txt
@@ -20,6 +20,10 @@
From 1.6.2 to 1.8:
+* A couple of CLI commands in res_ais were changed back to their original form:
+ "ais show clm members" --> "ais clm show members"
+ "ais show evt event channels" --> "ais evt show event channels"
+
* The default value for 'autofill' and 'shared_lastcall' in queues.conf has
been changed to 'yes'.
diff --git a/res/ais/clm.c b/res/ais/clm.c
index 219646f6a..d290ee2cd 100644
--- a/res/ais/clm.c
+++ b/res/ais/clm.c
@@ -79,9 +79,9 @@ static char *ais_clm_show_members(struct ast_cli_entry *e, int cmd, struct ast_c
switch (cmd) {
case CLI_INIT:
- e->command = "ais show clm members";
+ e->command = "ais clm show members";
e->usage =
- "Usage: ais show clm members\n"
+ "Usage: ais clm show members\n"
" List members of the cluster using the CLM (Cluster Membership) service.\n";
return NULL;
diff --git a/res/ais/evt.c b/res/ais/evt.c
index 18c0be988..9438d7740 100644
--- a/res/ais/evt.c
+++ b/res/ais/evt.c
@@ -246,9 +246,9 @@ static char *ais_evt_show_event_channels(struct ast_cli_entry *e, int cmd, struc
switch (cmd) {
case CLI_INIT:
- e->command = "ais show evt event channels";
+ e->command = "ais evt show event channels";
e->usage =
- "Usage: ais show evt event channels\n"
+ "Usage: ais evt show event channels\n"
" List configured event channels for the (EVT) Eventing service.\n";
return NULL;