diff options
| author | Jose <jose@zeroc.com> | 2016-07-01 18:50:05 +0200 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2016-07-01 19:10:17 +0200 |
| commit | bbbcf7e1b1be7c78c86f5c9c9f28880f7ec4cec0 (patch) | |
| tree | 035f56429cccdd3c519a6792d4f54dbe4953a6cf /java/src | |
| parent | Fix (ICE-7200) - _tempnam usage in Windows (diff) | |
| download | ice-bbbcf7e1b1be7c78c86f5c9c9f28880f7ec4cec0.tar.bz2 ice-bbbcf7e1b1be7c78c86f5c9c9f28880f7ec4cec0.tar.xz ice-bbbcf7e1b1be7c78c86f5c9c9f28880f7ec4cec0.zip | |
OpenSSL-1.1.0-pre5 support
Conflicts:
cpp/src/Ice/PropertyNames.cpp
cpp/src/Ice/PropertyNames.h
csharp/src/Ice/PropertyNames.cs
java/src/Ice/src/main/java/IceInternal/PropertyNames.java
js/src/Ice/PropertyNames.js
Diffstat (limited to 'java/src')
| -rw-r--r-- | java/src/Ice/src/main/java/IceInternal/PropertyNames.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/java/src/Ice/src/main/java/IceInternal/PropertyNames.java b/java/src/Ice/src/main/java/IceInternal/PropertyNames.java index 2cc1df08f15..92fc0f48027 100644 --- a/java/src/Ice/src/main/java/IceInternal/PropertyNames.java +++ b/java/src/Ice/src/main/java/IceInternal/PropertyNames.java @@ -6,7 +6,7 @@ // ICE_LICENSE file included in this distribution. // // ********************************************************************** -// Generated by makeprops.py from file ./config/PropertyNames.xml, Thu Apr 7 10:23:17 2016 +// Generated by makeprops.py from file ../config/PropertyNames.xml, Fri Jul 1 19:08:40 2016 // IMPORTANT: Do not edit this file -- any edits made here will be lost! @@ -1004,6 +1004,7 @@ public final class PropertyNames 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), |