summaryrefslogtreecommitdiff
path: root/cpp/src/Ice/PropertyNames.cpp
diff options
context:
space:
mode:
authorBernard Normier <bernard@zeroc.com>2007-11-20 09:16:56 -0500
committerBernard Normier <bernard@zeroc.com>2007-11-20 09:16:56 -0500
commit470bb86bfbd42b20758cdc64a80393e2aac64749 (patch)
treeb24232d1df8a3efb6882ed80f20b32cb0a325cdc /cpp/src/Ice/PropertyNames.cpp
parentMissing Windows makefile (diff)
parentRemoved makprops.py from remove files list (diff)
downloadice-470bb86bfbd42b20758cdc64a80393e2aac64749.tar.bz2
ice-470bb86bfbd42b20758cdc64a80393e2aac64749.tar.xz
ice-470bb86bfbd42b20758cdc64a80393e2aac64749.zip
Merge branch 'master' of cvs:/home/git/ice
Diffstat (limited to 'cpp/src/Ice/PropertyNames.cpp')
-rw-r--r--cpp/src/Ice/PropertyNames.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/cpp/src/Ice/PropertyNames.cpp b/cpp/src/Ice/PropertyNames.cpp
index 8f282dcdb08..f20324c3f4d 100644
--- a/cpp/src/Ice/PropertyNames.cpp
+++ b/cpp/src/Ice/PropertyNames.cpp
@@ -7,7 +7,7 @@
//
// **********************************************************************
//
-// Generated by makeprops.py from file ..\config\PropertyNames.xml, Mon Oct 29 16:59:13 2007
+// Generated by makeprops.py from file ../config/PropertyNames.xml, Tue Nov 20 11:07:30 2007
// IMPORTANT: Do not edit this file -- any edits made here will be lost!
@@ -201,6 +201,7 @@ const IceInternal::Property IceGridPropsData[] =
IceInternal::Property("IceGrid.Node.ThreadPool.SizeWarn", false, 0),
IceInternal::Property("IceGrid.Node.ThreadPool.StackSize", false, 0),
IceInternal::Property("IceGrid.Node.AllowRunningServersAsRoot", false, 0),
+ IceInternal::Property("IceGrid.Node.AllowEndpointsOverride", false, 0),
IceInternal::Property("IceGrid.Node.CollocateRegistry", false, 0),
IceInternal::Property("IceGrid.Node.Data", false, 0),
IceInternal::Property("IceGrid.Node.DisableOnFailure", false, 0),