[asterisk-commits] russell: trunk r294536 - in /trunk: ./ res/ais/

[SVN commits to the Asterisk project]

Author: russell
Date: Wed Nov 10 08:15:53 2010
New Revision: 294536

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=294536
Log:
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.
........

Modified:
    trunk/   (props changed)
    trunk/UPGRADE-1.8.txt
    trunk/res/ais/clm.c
    trunk/res/ais/evt.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.8-merged' - no diff available.

Modified: trunk/UPGRADE-1.8.txt
URL: http://svnview.digium.com/svn/asterisk/trunk/UPGRADE-1.8.txt?view=diff&rev=294536&r1=294535&r2=294536
==============================================================================
--- trunk/UPGRADE-1.8.txt (original)
+++ trunk/UPGRADE-1.8.txt Wed Nov 10 08:15:53 2010
@@ -19,6 +19,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'.

Modified: trunk/res/ais/clm.c
URL: http://svnview.digium.com/svn/asterisk/trunk/res/ais/clm.c?view=diff&rev=294536&r1=294535&r2=294536
==============================================================================
--- trunk/res/ais/clm.c (original)
+++ trunk/res/ais/clm.c Wed Nov 10 08:15:53 2010
@@ -79,9 +79,9 @@
 
 	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;
 

Modified: trunk/res/ais/evt.c
URL: http://svnview.digium.com/svn/asterisk/trunk/res/ais/evt.c?view=diff&rev=294536&r1=294535&r2=294536
==============================================================================
--- trunk/res/ais/evt.c (original)
+++ trunk/res/ais/evt.c Wed Nov 10 08:15:53 2010
@@ -246,9 +246,9 @@
 
 	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;