diff options
| author | Jose <jose@zeroc.com> | 2016-07-01 22:06:44 +0200 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2016-07-01 22:06:44 +0200 |
| commit | f46cc14601a5ac724bed901f03bc547bdb41cb60 (patch) | |
| tree | f6048cf559b4124ce34bf6650b93144791f94d32 /csharp/src | |
| parent | Fixed ICE-7210 - Added IceSSL dependency when building tests (diff) | |
| parent | OpenSSL-1.1.0-pre5 support (diff) | |
| download | ice-f46cc14601a5ac724bed901f03bc547bdb41cb60.tar.bz2 ice-f46cc14601a5ac724bed901f03bc547bdb41cb60.tar.xz ice-f46cc14601a5ac724bed901f03bc547bdb41cb60.zip | |
Merge remote-tracking branch 'origin/3.6'
Conflicts:
config/Make.common.rules
cpp/Makefile
cpp/config/Make.rules
cpp/config/Make.rules.Linux
cpp/src/Ice/InstrumentationI.cpp
cpp/src/Ice/PropertyNames.cpp
cpp/src/Ice/PropertyNames.h
cpp/src/IceSSL/Makefile
cpp/src/IceUtil/Makefile
cpp/test/Glacier2/attack/Makefile
cpp/test/Glacier2/attack/Makefile.mak
cpp/test/Glacier2/router/Makefile
cpp/test/Glacier2/sessionHelper/Makefile
cpp/test/Glacier2/staticFiltering/Makefile
cpp/test/Ice/objects/Makefile
cpp/test/IceSSL/configuration/AllTests.cpp
cpp/test/IceUtil/stacktrace/StackTrace.debug.Linux
cpp/test/IceUtil/stacktrace/StackTrace.release.Linux
csharp/src/Ice/PropertyNames.cs
java/Makefile
java/gradle.properties
java/gradle/ice.gradle
java/src/Ice/src/main/java/IceInternal/PropertyNames.java
java/test/build.gradle
js/src/Ice/PropertyNames.js
man/man1/icegridadmin.1
man/man1/transformdb.1
php/BuildInstructionsWindows.md
php/Makefile
php/config/Make.rules.Darwin
php/config/Make.rules.mak.php
php/config/Make.rules.php
php/src/IcePHP/Makefile
php/src/Makefile
php/src/Makefile.mak
php/src/php5/.depend.mak
php/src/php5/Communicator.cpp
php/src/php5/Config.h
php/src/php5/Connection.cpp
php/src/php5/Endpoint.cpp
php/src/php5/IcePHP.rc
php/src/php5/Makefile
php/src/php5/Makefile.mak
php/src/php5/Operation.cpp
php/src/php5/Types.cpp
php/src/php5/Types.h
php/src/php5/Util.cpp
php/src/php7/Communicator.cpp
php/src/php7/Communicator.h
php/src/php7/Config.h
php/src/php7/Connection.cpp
php/src/php7/Endpoint.cpp
php/src/php7/IcePHP.rc
php/src/php7/Makefile
php/src/php7/Operation.cpp
php/src/php7/Types.cpp
php/src/php7/Types.h
php/src/php7/Util.cpp
scripts/TestUtil.py
Diffstat (limited to 'csharp/src')
| -rw-r--r-- | csharp/src/Ice/PropertyNames.cs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/csharp/src/Ice/PropertyNames.cs b/csharp/src/Ice/PropertyNames.cs index b32ef13b734..b0e3e770a9d 100644 --- a/csharp/src/Ice/PropertyNames.cs +++ b/csharp/src/Ice/PropertyNames.cs @@ -6,7 +6,7 @@ // ICE_LICENSE file included in this distribution. // // ********************************************************************** -// Generated by makeprops.py from file ./config/PropertyNames.xml, Thu Apr 7 10:41:53 2016 +// Generated by makeprops.py from file ../config/PropertyNames.xml, Fri Jul 1 19:50:59 2016 // IMPORTANT: Do not edit this file -- any edits made here will be lost! @@ -998,6 +998,7 @@ namespace IceInternal new Property(@"^IceSSL\.ProtocolVersionMax$", false, null), new Property(@"^IceSSL\.ProtocolVersionMin$", false, null), new Property(@"^IceSSL\.Random$", false, null), + new Property(@"^IceSSL\.SecurityLevel$", false, null), new Property(@"^IceSSL\.Trace\.Security$", false, null), new Property(@"^IceSSL\.TrustOnly$", false, null), new Property(@"^IceSSL\.TrustOnly\.Client$", false, null), |