diff options
| author | Bernard Normier <bernard@zeroc.com> | 2014-09-10 19:09:53 +0000 |
|---|---|---|
| committer | Bernard Normier <bernard@zeroc.com> | 2014-09-10 19:09:53 +0000 |
| commit | ac587d9f1a6d34e46956fd17c81f99beb7ed97ad (patch) | |
| tree | fa09b2b2d5b6037c76976ee293eb0d15b7a93717 /cpp/test | |
| parent | Fix networkProxy test dependencies (diff) | |
| download | ice-ac587d9f1a6d34e46956fd17c81f99beb7ed97ad.tar.bz2 ice-ac587d9f1a6d34e46956fd17c81f99beb7ed97ad.tar.xz ice-ac587d9f1a6d34e46956fd17c81f99beb7ed97ad.zip | |
IceGrid::Admin now provides remote access to IceGrid registry and node Admin objects, and icegridadmin uses these
new operations to show the Ice log file for IceGrid registries and IceGrid nodes (ICE-2400)
Diffstat (limited to 'cpp/test')
| -rw-r--r-- | cpp/test/Ice/Makefile.mak | 2 | ||||
| -rw-r--r-- | cpp/test/IceGrid/replication/application.xml | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/cpp/test/Ice/Makefile.mak b/cpp/test/Ice/Makefile.mak index 677b9d433df..10c9e92d648 100644 --- a/cpp/test/Ice/Makefile.mak +++ b/cpp/test/Ice/Makefile.mak @@ -48,7 +48,7 @@ SUBDIRS = $(SUBDIRS) \ gc \ interceptor \ logger \ - networkProxy + networkProxy \ properties \ servantLocator \ slicing \ diff --git a/cpp/test/IceGrid/replication/application.xml b/cpp/test/IceGrid/replication/application.xml index ef30515ed2e..a96761a6292 100644 --- a/cpp/test/IceGrid/replication/application.xml +++ b/cpp/test/IceGrid/replication/application.xml @@ -19,7 +19,7 @@ <property name="IceGrid.Node.Trace.Adapter" value="0"/> <property name="Ice.Trace.Network" value="0"/> <property name="Ice.Warn.Connections" value="0"/> - <property name="Ice.Admin.Endpoints" value=""/> + <property name="Ice.Admin.Enabled" value="0"/> <property name="Ice.Default.EncodingVersion" value="${encoding}"/> </server> @@ -58,7 +58,7 @@ <property name="Ice.Warn.Connections" value="0"/> <property name="IceGrid.Registry.Trace.Locator" value="0"/> <property name="IceGrid.Registry.UserAccounts" value="${test.dir}/useraccounts.txt"/> - <property name="Ice.Admin.Endpoints" value=""/> + <property name="Ice.Admin.Enabled" value="0"/> <property name="Ice.Default.EncodingVersion" value="${encoding}"/> </server> |