[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  ece0b81c0959c8e901bc28b271a93ad2ae38433c (commit)
       via  1099cff9b4ef4ca2550301970de08606d70db065 (commit)
      from  37d389ce17045bf743e4e2875c36d68e3b67b711 (commit)

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


- Log -----------------------------------------------------------------
commit ece0b81c0959c8e901bc28b271a93ad2ae38433c
Merge: 1099cff 37d389c
Author: Mark Michelson <mmichelson at digium.com>
Date:   Tue Sep 7 17:32:56 2010 -0500

    Merge branch 'master' of git.asterisk.org:asterisk-scf/integration/bridging


commit 1099cff9b4ef4ca2550301970de08606d70db065
Author: Mark Michelson <mmichelson at digium.com>
Date:   Tue Sep 7 17:29:33 2010 -0500

    Update bridging.conf to use appropriate ports for service location.

diff --git a/config/bridging.conf b/config/bridging.conf
index 089a988..d140cdf 100644
--- a/config/bridging.conf
+++ b/config/bridging.conf
@@ -4,5 +4,4 @@
 Hydra.BridgeService.Endpoints=default
 
 # A proxy to the service locator management service
-ServiceLocatorManagementProxy=LocatorServiceManagement:tcp -p 5674
-
+ServiceLocatorManagementProxy=LocatorServiceManagement:tcp -p 4422

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


-- 
asterisk-scf/integration/bridging.git