[asterisk-commits] russell: branch russell/sla_updates r57148 - in /team/russell/sla_updates: ./...

[asterisk-commits at lists.digium.com]

Author: russell
Date: Wed Feb 28 14:00:57 2007
New Revision: 57148

URL: http://svn.digium.com/view/asterisk?view=rev&rev=57148
Log:
Merged revisions 57144,57146 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r57144 | russell | 2007-02-28 13:56:20 -0600 (Wed, 28 Feb 2007) | 6 lines

Merge changes from svn/asterisk/team/russell/sla_updates

* Add support for the "barge=no" option for trunks.  If this option is set,
  then stations will not be able to join in on a call that is on progress
  on this trunk.

........
r57146 | russell | 2007-02-28 13:58:56 -0600 (Wed, 28 Feb 2007) | 2 lines

Minor formatting change

........

Modified:
    team/russell/sla_updates/   (props changed)
    team/russell/sla_updates/apps/app_meetme.c

Propchange: team/russell/sla_updates/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Wed Feb 28 14:00:57 2007
@@ -1,1 +1,1 @@
-/branches/1.4:1-57142
+/branches/1.4:1-57147

Modified: team/russell/sla_updates/apps/app_meetme.c
URL: http://svn.digium.com/view/asterisk/team/russell/sla_updates/apps/app_meetme.c?view=diff&rev=57148&r1=57147&r2=57148
==============================================================================
--- team/russell/sla_updates/apps/app_meetme.c (original)
+++ team/russell/sla_updates/apps/app_meetme.c Wed Feb 28 14:00:57 2007
@@ -1014,13 +1014,13 @@
 		ast_cli(fd, "=== ---------------------------------------------------------\n"
 		            "=== Trunk Name:       %s\n"
 		            "=== ==> Device:       %s\n"
-					"=== ==> AutoContext:  %s\n"
-					"=== ==> RingTimeout:  %s\n"
-					"=== ==> BargeAllowed: %s\n"
-					"=== ==> Stations ...\n",
-					trunk->name, trunk->device, 
-					S_OR(trunk->autocontext, "(none)"), 
-					ring_timeout,
+		            "=== ==> AutoContext:  %s\n"
+		            "=== ==> RingTimeout:  %s\n"
+		            "=== ==> BargeAllowed: %s\n"
+		            "=== ==> Stations ...\n",
+		            trunk->name, trunk->device, 
+		            S_OR(trunk->autocontext, "(none)"), 
+		            ring_timeout,
 		            trunk->barge_disabled ? "No" : "Yes");
 		AST_RWLIST_RDLOCK(&sla_stations);
 		AST_LIST_TRAVERSE(&trunk->stations, station_ref, entry)