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

diff --git a/UPGRADE-1.8.txt b/UPGRADE-1.8.txt
index da1362554b72ed23103e7301238c5b07c2e5496c..e9bee24de555d3c097709f0dac4b506809c0fc99 100644 (file)
--- 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 219646f6a37bacf24ec2b0fbe0582619e612ec66..d290ee2cd3738d08152dbd12c35c9a506c6eaa3a 100644 (file)
--- 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 18c0be9881eeec2a4230bbe1e8a1a4cc67236634..9438d774088a41d28d7e6f6615b084040cb73025 100644 (file)
--- 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;