svn commit: r1303580 - /subversion/site/publish/roadmap.html

[da...@apache.org]

Author: danielsh
Date: Wed Mar 21 21:31:50 2012
New Revision: 1303580

URL: http://svn.apache.org/viewvc?rev=1303580&view=rev
Log:
* roadmap.html
  (#next-release-status): Add a couple of tasks.  (Apparently all of them are on 
    the wiki.)

cmpilato -- should the master password feature be in the table too?

Modified:
    subversion/site/publish/roadmap.html

Modified: subversion/site/publish/roadmap.html
URL: http://svn.apache.org/viewvc/subversion/site/publish/roadmap.html?rev=1303580&r1=1303579&r2=1303580&view=diff
==============================================================================
--- subversion/site/publish/roadmap.html (original)
+++ subversion/site/publish/roadmap.html Wed Mar 21 21:31:50 2012
@@ -543,6 +543,25 @@ numbering, compatibility, and deprecatio
     <td>Review items on the <a href="http://svn.apache.org/repos/asf/subversion/branches/performance/">performance branch</a>,
         and determine which bits can/should be included in 1.8.</td>
   </tr>
+  <tr class="task-level-1 in-progress">
+    <td class="task-name">Symmetric merge</td>
+    <td class="task-status">In Progress</td>
+    <td><a href="http://wiki.apache.org/subversion/SymmetricMerge"
+        >wiki page</a></td>
+  </tr>
+  <tr class="task-level-1 in-progress">
+    <td class="task-name">Inherited properties</td>
+    <td class="task-status">In Progress</td>
+    <td><a href="http://wiki.apache.org/subversion/InheritedProperties"
+        >wiki page</a></td>
+  </tr>
+  <tr class="task-level-1 in-progress">
+    <td class="task-name">Server-dictated configuration</td>
+    <td class="task-status">Blocked</td>
+    <td>Depends on inherited properties.
+        <a href="http://wiki.apache.org/subversion/ServerDictatedConfiguration"
+        >wiki page</a></td>
+  </tr>
   <tr class="task-level-1 not-started">
     <td class="task-name">Test Review</td>
     <td class="task-status">Not Started</td>