diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2015-11-19 17:34:00 +0100 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2015-11-19 17:34:00 +0100 |
| commit | e1cd192dd0b8bc107f2113094750f5e2be654af5 (patch) | |
| tree | 37dac76de62efcf78c763fd4004bd886d4c112e2 /cpp/src/IceGrid/DescriptorHelper.cpp | |
| parent | Merge remote-tracking branch 'origin/3.6' (diff) | |
| download | ice-e1cd192dd0b8bc107f2113094750f5e2be654af5.tar.bz2 ice-e1cd192dd0b8bc107f2113094750f5e2be654af5.tar.xz ice-e1cd192dd0b8bc107f2113094750f5e2be654af5.zip | |
Renamed the server and service data directories to data and data_<service>
Diffstat (limited to 'cpp/src/IceGrid/DescriptorHelper.cpp')
| -rw-r--r-- | cpp/src/IceGrid/DescriptorHelper.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cpp/src/IceGrid/DescriptorHelper.cpp b/cpp/src/IceGrid/DescriptorHelper.cpp index 05b48ecdc5f..8e0dc556420 100644 --- a/cpp/src/IceGrid/DescriptorHelper.cpp +++ b/cpp/src/IceGrid/DescriptorHelper.cpp @@ -1065,9 +1065,9 @@ Resolver::getReserved() reserved["application.distrib"] = "${node.data}/distrib/${application}"; reserved["server.distrib"] = "${node.data}/servers/${server}/distrib"; reserved["server"] = ""; - reserved["server.data"] = "${node.data}/servers/${server}/server_data"; + reserved["server.data"] = "${node.data}/servers/${server}/data"; reserved["service"] = ""; - reserved["service.data"] = "${node.data}/servers/${server}/service_data/${service}"; + reserved["service.data"] = "${node.data}/servers/${server}/data_${service}"; return reserved; } |