Merge pull request #238 from akrherz/3.10

Openfire 3.10.1 Release
igniterealtime · Jun 16, 2015 · 77ba639 · 77ba639
2 parents 3776401 + 9f5d647
commit 77ba639
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/build/build.xml b/build/build.xml
@@ -26,7 +26,7 @@
     <property name="version.major" value="3"/>
     <property name="version.minor" value="10"/>
     <property name="version.revision" value="1"/>
-    <property name="version.extra" value="rc"/>    <!-- For 'alpha', 'beta', or 'rc' -->
+    <property name="version.extra" value=""/>    <!-- For 'alpha', 'beta', or 'rc' -->
 
 	<property name="javac.source" value="1.7"/>
 	<property name="javac.target" value="1.7"/>

diff --git a/documentation/dist/changelog.html b/documentation/dist/changelog.html
@@ -162,19 +162,23 @@ <h1>Openfire Changelog</h1>
 
 	<div id="pageBody">
 
-<h2>3.10.1 Release Candidate -- <span style="font-weight: normal;">May 31, 2015</span></h2>
+<h2>3.10.1 -- <span style="font-weight: normal;">Jun 16, 2015</span></h2>
 <h2>Bug</h2>
 <ul>
 <li>[<a href='https://igniterealtime.org/issues/browse/OF-881'>OF-881</a>] -         NIOConnection Thread Deadlock when two clients in each others roster simultaneously disconnect
 </li>
 <li>[<a href='https://igniterealtime.org/issues/browse/OF-883'>OF-883</a>] -         High CPU usage and hangup after a few days of running
 </li>
+<li>[<a href='https://igniterealtime.org/issues/browse/OF-889'>OF-889</a>] -         NPE on Admin Console (client sessions listing)
+</li>
 <li>[<a href='https://igniterealtime.org/issues/browse/OF-907'>OF-907</a>] -         SSLv2 Hello is rejected; prevents some clients connecting
 </li>
 <li>[<a href='https://igniterealtime.org/issues/browse/OF-909'>OF-909</a>] -         BOSH response should return ack attribute
 </li>
 <li>[<a href='https://igniterealtime.org/issues/browse/OF-910'>OF-910</a>] -         MUC de-synchronization issues
 </li>
+<li>[<a href='https://igniterealtime.org/issues/browse/OF-916'>OF-916</a>] -         Deadlock with MINA sslFilter
+</li>
 </ul>
 
 

diff --git a/src/java/org/jivesoftware/openfire/XMPPServer.java b/src/java/org/jivesoftware/openfire/XMPPServer.java
@@ -362,7 +362,7 @@ private void initialize() throws FileNotFoundException {
             host = "127.0.0.1";        	
         }
 
-        version = new Version(3, 10, 1, Version.ReleaseStatus.Release_Candidate, -1);
+        version = new Version(3, 10, 1, Version.ReleaseStatus.Release, -1);
         if ("true".equals(JiveGlobals.getXMLProperty("setup"))) {
             setupMode = false;
         }