diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2016-11-16 09:56:50 +0100 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2016-11-16 09:56:50 +0100 |
| commit | d6259aac12626d3fae8724435a6f3502cc23e54f (patch) | |
| tree | 5967fb99023a53ad20ae4d261e3fb2d8cd5aca2f /cpp/src/IceGrid/IceGridNode.cpp | |
| parent | Merge pull request #14 from AndiDog/feature/fix-updating-props-shared-communi... (diff) | |
| parent | Added CHANGELOG entry for IceGrid bug and fix to use getPropertyAsInt (diff) | |
| download | ice-d6259aac12626d3fae8724435a6f3502cc23e54f.tar.bz2 ice-d6259aac12626d3fae8724435a6f3502cc23e54f.tar.xz ice-d6259aac12626d3fae8724435a6f3502cc23e54f.zip | |
Merge remote-tracking branch 'origin/3.6'
Diffstat (limited to 'cpp/src/IceGrid/IceGridNode.cpp')
| -rw-r--r-- | cpp/src/IceGrid/IceGridNode.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cpp/src/IceGrid/IceGridNode.cpp b/cpp/src/IceGrid/IceGridNode.cpp index 463effd1e98..de7d308702e 100644 --- a/cpp/src/IceGrid/IceGridNode.cpp +++ b/cpp/src/IceGrid/IceGridNode.cpp @@ -452,7 +452,7 @@ NodeService::startImpl(int argc, char* argv[], int& status) string instanceName = properties->getProperty("IceGrid.InstanceName"); if(instanceName.empty()) { - instanceName = properties->getProperty("IceGridDiscovery.InstanceName"); + instanceName = properties->getProperty("IceLocatorDiscovery.InstanceName"); } if(instanceName.empty()) { |