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/Ice/PropertyNames.h | |
| 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/Ice/PropertyNames.h')
| -rw-r--r-- | cpp/src/Ice/PropertyNames.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cpp/src/Ice/PropertyNames.h b/cpp/src/Ice/PropertyNames.h index e9c85a1e59f..c505e5aaeb5 100644 --- a/cpp/src/Ice/PropertyNames.h +++ b/cpp/src/Ice/PropertyNames.h @@ -6,7 +6,7 @@ // ICE_LICENSE file included in this distribution. // // ********************************************************************** -// Generated by makeprops.py from file ../config/PropertyNames.xml, Tue Oct 18 11:38:00 2016 +// Generated by makeprops.py from file ./config/PropertyNames.xml, Wed Nov 16 09:52:45 2016 // IMPORTANT: Do not edit this file -- any edits made here will be lost! @@ -59,7 +59,7 @@ public: static const PropertyArray IceProps; static const PropertyArray IceMXProps; static const PropertyArray IceDiscoveryProps; - static const PropertyArray IceGridDiscoveryProps; + static const PropertyArray IceLocatorDiscoveryProps; static const PropertyArray IceBoxProps; static const PropertyArray IceBoxAdminProps; static const PropertyArray IceGridAdminProps; |