diff options
author | Jose <jose@zeroc.com> | 2016-07-06 13:12:48 +0200 |
---|---|---|
committer | Jose <jose@zeroc.com> | 2016-07-06 13:12:48 +0200 |
commit | 5135d7d90632f987d24683565132be8d4f954ba1 (patch) | |
tree | 67457195facb036b012befd6d27cb0795bf10a81 /java/src | |
parent | Merge remote-tracking branch 'origin/3.6-stretch' into 3.6 (diff) | |
download | ice-5135d7d90632f987d24683565132be8d4f954ba1.tar.bz2 ice-5135d7d90632f987d24683565132be8d4f954ba1.tar.xz ice-5135d7d90632f987d24683565132be8d4f954ba1.zip |
Remove IceSSL.SecurityLevel reintroduced with 3.6-stretch merge
Diffstat (limited to 'java/src')
-rw-r--r-- | java/src/Ice/src/main/java/IceInternal/PropertyNames.java | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/java/src/Ice/src/main/java/IceInternal/PropertyNames.java b/java/src/Ice/src/main/java/IceInternal/PropertyNames.java index 838d58f06db..e6d7607f8a0 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, Wed Jul 6 12:39:37 2016 +// Generated by makeprops.py from file ./config/PropertyNames.xml, Wed Jul 6 13:12:34 2016 // IMPORTANT: Do not edit this file -- any edits made here will be lost! @@ -1004,7 +1004,6 @@ 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), |