[asterisk-scf-commits] asterisk-scf/integration/media_operations_core.git branch "retry_deux" updated.

[Commits to the Asterisk SCF project code repositories]

branch "retry_deux" has been updated
       via  cbe01450954bfeb1b87d1e6258461ed24fd990ac (commit)
       via  c046d0e3957ba3ee6492379eb649f6bdbb641a33 (commit)
      from  6a47e2804b1911f5a6a796fe9765b8e579f07730 (commit)

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


- Log -----------------------------------------------------------------
commit cbe01450954bfeb1b87d1e6258461ed24fd990ac
Merge: c046d0e 6a47e28
Author: Ken Hunt <ken.hunt at digium.com>
Date:   Thu May 3 16:13:12 2012 -0500

    Merge branch 'retry_deux' of git.asterisk.org:asterisk-scf/integration/media_operations_core into retry_deux


commit c046d0e3957ba3ee6492379eb649f6bdbb641a33
Author: Ken Hunt <ken.hunt at digium.com>
Date:   Thu May 3 16:12:25 2012 -0500

    In unit test config, ServiceLocator set to Standalone.

diff --git a/config/test_component.conf b/config/test_component.conf
index 1305e3d..ae429d3 100644
--- a/config/test_component.conf
+++ b/config/test_component.conf
@@ -1,5 +1,6 @@
 IceBox.InheritProperties=1
 Ice.Warn.UnknownProperties=0
+Ice.ThreadPool.Client.Size=4
 
 IceBox.InstanceName=IceBox
 IceBox.ServiceManager.Endpoints=tcp -h 127.0.0.1 -p 10007
@@ -31,6 +32,7 @@ TopicManager.Proxy=ServiceDiscovery/TopicManager:tcp -h 127.0.0.1 -p 4421
 
 ServiceDiscovery.IceStorm.InstanceName=ServiceDiscovery
 
+ServiceDiscovery.Standalone=true
 ServiceDiscovery.IceStorm.TopicManager.Endpoints=tcp -h 127.0.0.1 -p 4421
 ServiceDiscovery.IceStorm.Publish.Endpoints=tcp -h 127.0.0.1 -p 4423
 ServiceDiscovery.IceStorm.Trace.TopicManager=2

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


-- 
asterisk-scf/integration/media_operations_core.git