From e1cd192dd0b8bc107f2113094750f5e2be654af5 Mon Sep 17 00:00:00 2001
From: Benoit Foucher <benoit@zeroc.com>
Date: Thu, 19 Nov 2015 17:34:00 +0100
Subject: Renamed the server and service data directories to data and
 data_<service>

---
 cpp/src/IceGrid/DescriptorHelper.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'cpp/src/IceGrid/DescriptorHelper.cpp')

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;
 }
 
-- 
cgit v1.2.3