diff options
| author | Justin Ross <jross@apache.org> | 2012-03-08 10:23:19 +0000 |
|---|---|---|
| committer | Justin Ross <jross@apache.org> | 2012-03-08 10:23:19 +0000 |
| commit | 9a4b1b0850d6c2d6a62731156d416587cac39826 (patch) | |
| tree | 25e5169b047e7a787706da68ba89544f16c43ac1 /qpid/java/broker/src/main | |
| parent | 57e923a3c28bf183dbb8bcd7e1789d26cfaf20d8 (diff) | |
| download | qpid-python-9a4b1b0850d6c2d6a62731156d416587cac39826.tar.gz | |
QPID-3864: Adjust version numbers on trunk for development toward 0.18
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1298340 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/java/broker/src/main')
| -rwxr-xr-x | qpid/java/broker/src/main/java/broker.bnd | 2 | ||||
| -rw-r--r-- | qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ServerConfiguration.java | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/qpid/java/broker/src/main/java/broker.bnd b/qpid/java/broker/src/main/java/broker.bnd index 25b0495a63..fa433848a6 100755 --- a/qpid/java/broker/src/main/java/broker.bnd +++ b/qpid/java/broker/src/main/java/broker.bnd @@ -17,7 +17,7 @@ # under the License. # -ver: 0.15.0 +ver: 0.17.0 Bundle-SymbolicName: qpid-broker Bundle-Version: ${ver} diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ServerConfiguration.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ServerConfiguration.java index 259902a938..5d0546f6a7 100644 --- a/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ServerConfiguration.java +++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ServerConfiguration.java @@ -737,7 +737,7 @@ public class ServerConfiguration extends ConfigurationPlugin public String getConnectorKeyManagerFactoryAlgorithm() { final String systemFallback = KeyManagerFactory.getDefaultAlgorithm(); - // deprecated, pre-0.15 brokers supported this name. + // deprecated, pre-0.17 brokers supported this name. final String fallback = getStringValue("connector.ssl.certType", systemFallback); return getStringValue("connector.ssl.keyManagerFactoryAlgorithm", fallback); } |