promote

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1533446 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/STATUS b/STATUS
index 73e1b07e62e2a2fe2f0f4c9ddcc56cbc8b4251ef..737a9d1a0531b5982c52899c8ee817234d85c06c 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -97,6 +97,18 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
+  * mod_dav: Fix 55306.  Don't require lock tokens for COPY source.
+    trunk patches: https://svn.apache.org/r1528718
+    2.4.x: trunk works, CHANGES needs to be written when merging
+    +1: breser, minfrin, jim
+  
+  * mod_dav: Fix 55397.  dav_resource->uri treated as unencoded. This was an
+    unnecessary ABI changed introduced in 2.4.6.
+    trunk patches: https://svn.apache.org/r1529559
+                   https://svn.apache.org/r1531505
+    2.4.x: trunk works, CHANGES needs to be written when merging
+    +1: breser, minfrin, jim
+
 
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
@@ -190,18 +202,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
     2.4.x patch: https://people.apache.org/~kbrand/mod_ssl-2.4.x-ekh.diff
     +1: kbrand,
 
-  * mod_dav: Fix 55306.  Don't require lock tokens for COPY source.
-    trunk patches: https://svn.apache.org/r1528718
-    2.4.x: trunk works, CHANGES needs to be written when merging
-    +1: breser, minfrin, jim
-  
-  * mod_dav: Fix 55397.  dav_resource->uri treated as unencoded. This was an
-    unnecessary ABI changed introduced in 2.4.6.
-    trunk patches: https://svn.apache.org/r1529559
-                   https://svn.apache.org/r1531505
-    2.4.x: trunk works, CHANGES needs to be written when merging
-    +1: breser, minfrin, jim
-
   * mod_auth_form: Make sure the optional functions are loaded even when
     the AuthFormProvider isn't specified.
     trunk patch: https://svn.apache.org/r1531672