You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@turbine.apache.org by tv...@apache.org on 2010/07/25 17:02:20 UTC

svn commit: r979048 - /turbine/core/trunk/xdocs/changes.xml

Author: tv
Date: Sun Jul 25 15:02:20 2010
New Revision: 979048

URL: http://svn.apache.org/viewvc?rev=979048&view=rev
Log:
Document recent changes

Modified:
    turbine/core/trunk/xdocs/changes.xml

Modified: turbine/core/trunk/xdocs/changes.xml
URL: http://svn.apache.org/viewvc/turbine/core/trunk/xdocs/changes.xml?rev=979048&r1=979047&r2=979048&view=diff
==============================================================================
--- turbine/core/trunk/xdocs/changes.xml (original)
+++ turbine/core/trunk/xdocs/changes.xml Sun Jul 25 15:02:20 2010
@@ -24,7 +24,22 @@
   </properties>
 
   <body>
-    <release version="4.0-dev" date="in Subversion">
+    <release version="4.0-M1" date="in Subversion">
+      <action type="fix" dev="tv">
+        RunData.getContentType() was returning an empty string when it shouldn't
+      </action>
+      <action type="update" dev="tv">
+        Merged changes of the 2.3-branch into the trunk.
+      </action>
+      <action type="update" dev="tv">
+        Merged JSON-RPC-Service of the 2.3-branch into the trunk.
+      </action>
+      <action type="update" dev="tv">
+        Merged UIService of the 2.3-branch into the trunk.
+      </action>
+      <action type="update" dev="tv">
+        Merged TorqueSecurityService of the 2.3-branch (temporarily) into the trunk.
+      </action>
       <action type="update" dev="tv">
         Replaced the XSLT-Service with its Fulcrum counterpart.
       </action>