[asterisk-scf-commits] asterisk-scf/integration/bridging.git branch "master" updated.

[Commits to the Asterisk SCF project code repositories]

branch "master" has been updated
       via  809a2f5936683a4dd9c87af1bfcebd44d125414a (commit)
      from  9195b05feb161830ee1d8b78c8f1db7edad67cfd (commit)

Summary of changes:
 config/bridging.conf |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)


- Log -----------------------------------------------------------------
commit 809a2f5936683a4dd9c87af1bfcebd44d125414a
Author: David M. Lee <dlee at digium.com>
Date:   Wed Nov 3 16:00:15 2010 -0500

    Use IceBox.InheritProperties in the config file.

diff --git a/config/bridging.conf b/config/bridging.conf
index 840baea..7ba3738 100644
--- a/config/bridging.conf
+++ b/config/bridging.conf
@@ -9,4 +9,5 @@ LocatorService.Proxy=LocatorService:tcp -p 4411
 
 # A proxy to the IceStorm topic manager
 TopicManager.Proxy=AsteriskSCFIceStorm/TopicManager:default -p 10000
-IceBox.Service.BridgeManager=bridgeservice:create --Ice.Config=config/bridging.conf
+IceBox.InheritProperties=1
+IceBox.Service.BridgeManager=bridgeservice:create

-----------------------------------------------------------------------


-- 
asterisk-scf/integration/bridging.git