You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jspwiki.apache.org by ju...@apache.org on 2014/04/22 20:24:31 UTC

svn commit: r1589240 - in /jspwiki/trunk: ChangeLog jspwiki-war/src/main/java/org/apache/wiki/Release.java

Author: juanpablo
Date: Tue Apr 22 18:24:31 2014
New Revision: 1589240

URL: http://svn.apache.org/r1589240
Log:
 * 2.10.1-svn-15
       
 * Fixed JSPWIKI-822 - NPE thrown by PluginContext#getText()
       
 * JSPWIKI-814 - VersioningFileProvider does migrate original page properties (thanks to Brian Burch)

Modified:
    jspwiki/trunk/ChangeLog
    jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/Release.java

Modified: jspwiki/trunk/ChangeLog
URL: http://svn.apache.org/viewvc/jspwiki/trunk/ChangeLog?rev=1589240&r1=1589239&r2=1589240&view=diff
==============================================================================
--- jspwiki/trunk/ChangeLog (original)
+++ jspwiki/trunk/ChangeLog Tue Apr 22 18:24:31 2014
@@ -1,5 +1,13 @@
 2014-04-20  Juan Pablo Santos (juanpablo AT apache DOT org)
 
+       * 2.10.1-svn-15
+       
+       * Fixed JSPWIKI-822 - NPE thrown by PluginContext#getText()
+       
+       * JSPWIKI-814 - VersioningFileProvider does migrate original page properties (thanks to Brian Burch)
+
+2014-04-20  Juan Pablo Santos (juanpablo AT apache DOT org)
+
        * 2.10.1-svn-14
        
        * Fixed JSPWIKI-832 - [Portable] Problems setting up multiple wikis using a shared JSPWiki libraries 

Modified: jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/Release.java
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/Release.java?rev=1589240&r1=1589239&r2=1589240&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/Release.java (original)
+++ jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/Release.java Tue Apr 22 18:24:31 2014
@@ -72,7 +72,7 @@ public final class Release {
      *  <p>
      *  If the build identifier is empty, it is not added.
      */
-    public static final String     BUILD         = "14";
+    public static final String     BUILD         = "15";
     
     /**
      *  This is the generic version string you should use when printing out the version.  It is of