[asterisk-scf-commits] asterisk-scf/release/servicediscovery.git branch "master" updated.

[Commits to the Asterisk SCF project code repositories]

branch "master" has been updated
       via  aaff657ebc33e245d2721e2bb27ad3f44f7c7ef9 (commit)
       via  f5f07fb426c35417c6f73c7c9b7e4b2ce3d1dc80 (commit)
       via  60c7d5708bf016e64b96583af3df8118dc054c5d (commit)
      from  e2ae2ad8314bf9fbc10c8b27f6fdc9e068ee6c78 (commit)

Summary of changes:
 src/CMakeLists.txt                       |    4 ++--
 src/ServiceLocator.cpp                   |    2 +-
 src/ServiceLocatorManagement.cpp         |    2 +-
 src/ServiceLocatorStateReplicatorApp.cpp |    2 +-
 src/ServiceManagement.cpp                |    2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)


- Log -----------------------------------------------------------------
commit aaff657ebc33e245d2721e2bb27ad3f44f7c7ef9
Merge: f5f07fb e2ae2ad
Author: Mark Michelson <mmichelson at digium.com>
Date:   Fri Dec 30 14:53:50 2011 -0600

    Merge branch 'master' of git.asterisk.org:asterisk-scf/release/servicediscovery


commit f5f07fb426c35417c6f73c7c9b7e4b2ce3d1dc80
Author: Mark Michelson <mmichelson at digium.com>
Date:   Wed Dec 28 12:17:20 2011 -0600

    Adjust for name changes in ice-util-cpp

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 4f106e5..78174e6 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -13,7 +13,7 @@ astscf_component_add_files(service_locator ServiceLocatorStateListener.cpp)
 astscf_component_add_ice_libraries(service_locator IceStorm)
 astscf_component_add_boost_libraries(service_locator core thread date_time)
 astscf_component_build_icebox(service_locator)
-target_link_libraries(service_locator LoggingClient astscf-ice-util-cpp)
+target_link_libraries(service_locator LoggingClient ASTSCFIceUtilCpp)
 astscf_component_install(service_locator)
 
 astscf_component_init(ServiceLocatorStateReplicator)

commit 60c7d5708bf016e64b96583af3df8118dc054c5d
Author: Mark Michelson <mmichelson at digium.com>
Date:   Tue Dec 27 16:46:33 2011 -0600

    Adjust for logger name changes.

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index cfd57d9..4f106e5 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -13,7 +13,7 @@ astscf_component_add_files(service_locator ServiceLocatorStateListener.cpp)
 astscf_component_add_ice_libraries(service_locator IceStorm)
 astscf_component_add_boost_libraries(service_locator core thread date_time)
 astscf_component_build_icebox(service_locator)
-target_link_libraries(service_locator logging-client astscf-ice-util-cpp)
+target_link_libraries(service_locator LoggingClient astscf-ice-util-cpp)
 astscf_component_install(service_locator)
 
 astscf_component_init(ServiceLocatorStateReplicator)
@@ -23,5 +23,5 @@ astscf_component_add_files(ServiceLocatorStateReplicator ServiceLocatorStateRepl
 astscf_component_add_ice_libraries(ServiceLocatorStateReplicator IceStorm)
 astscf_component_add_boost_libraries(ServiceLocatorStateReplicator thread date_time)
 astscf_component_build_icebox(ServiceLocatorStateReplicator)
-target_link_libraries(ServiceLocatorStateReplicator logging-client)
+target_link_libraries(ServiceLocatorStateReplicator LoggingClient)
 astscf_component_install(ServiceLocatorStateReplicator)
diff --git a/src/ServiceLocator.cpp b/src/ServiceLocator.cpp
index b7ec895..94208ea 100644
--- a/src/ServiceLocator.cpp
+++ b/src/ServiceLocator.cpp
@@ -21,7 +21,7 @@
 #include <AsteriskSCF/Helpers/PropertyHelper.h>
 #include <AsteriskSCF/Core/Discovery/ServiceLocatorIf.h>
 #include <AsteriskSCF/Core/Discovery/ServiceLocatorEventsIf.h>
-#include <AsteriskSCF/logger.h>
+#include <AsteriskSCF/Logger.h>
 #include <AsteriskSCF/Logger/IceLogger.h>
 #include <AsteriskSCF/System/Component/ReplicaIf.h>
 #include <AsteriskSCF/CollocatedIceStorm/CollocatedIceStorm.h>
diff --git a/src/ServiceLocatorManagement.cpp b/src/ServiceLocatorManagement.cpp
index 0cfd407..48e17fe 100644
--- a/src/ServiceLocatorManagement.cpp
+++ b/src/ServiceLocatorManagement.cpp
@@ -22,7 +22,7 @@
 
 #include <AsteriskSCF/Core/Discovery/ServiceLocatorIf.h>
 #include <AsteriskSCF/Core/Discovery/ServiceLocatorEventsIf.h>
-#include <AsteriskSCF/logger.h>
+#include <AsteriskSCF/Logger.h>
 #include <AsteriskSCF/Async/ResponseCollector.h>
 
 #include "ServiceLocatorStateReplicationIf.h"
diff --git a/src/ServiceLocatorStateReplicatorApp.cpp b/src/ServiceLocatorStateReplicatorApp.cpp
index 23378f7..ecc505f 100644
--- a/src/ServiceLocatorStateReplicatorApp.cpp
+++ b/src/ServiceLocatorStateReplicatorApp.cpp
@@ -21,7 +21,7 @@
 
 #include <AsteriskSCF/Core/Discovery/ServiceLocatorIf.h>
 #include <AsteriskSCF/System/Component/ComponentServiceIf.h>
-#include <AsteriskSCF/logger.h>
+#include <AsteriskSCF/Logger.h>
 #include <AsteriskSCF/Logger/IceLogger.h>
 #include "ServiceLocatorStateReplicator.h"
 
diff --git a/src/ServiceManagement.cpp b/src/ServiceManagement.cpp
index 2beec01..c329520 100644
--- a/src/ServiceManagement.cpp
+++ b/src/ServiceManagement.cpp
@@ -23,7 +23,7 @@
 
 #include <AsteriskSCF/Core/Discovery/ServiceLocatorIf.h>
 #include <AsteriskSCF/Core/Discovery/ServiceLocatorEventsIf.h>
-#include <AsteriskSCF/logger.h>
+#include <AsteriskSCF/Logger.h>
 #include <AsteriskSCF/Async/ResponseCollector.h>
 
 #include "ServiceLocatorStateReplicationIf.h"

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


-- 
asterisk-scf/release/servicediscovery.git