]> git.ipfire.org Git - thirdparty/apache/httpd.git/commitdiff
vote and promote
authorStefan Eissing <icing@apache.org>
Mon, 18 Mar 2019 08:49:19 +0000 (08:49 +0000)
committerStefan Eissing <icing@apache.org>
Mon, 18 Mar 2019 08:49:19 +0000 (08:49 +0000)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1855736 13f79535-47bb-0310-9956-ffa450edef68

STATUS

diff --git a/STATUS b/STATUS
index 4f375699e21de0e635ab3ba31d5287f7b53b241d..ffa30bf582355a28528e768d541c30e33e8e2144 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -146,6 +146,12 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
      +1: jim, ylavic, covener
      jailletc36: require r1818321 and part of r1818341 to update doc accordingly
 
+   *) core: merge consecutive slashes in the path
+      trunk patch http://svn.apache.org/r1855705
+      2.4.x patch: http://people.apache.org/~covener/patches/mergeslashes-2.4.diff
+      +1: covener, rpluem, icing
+
+
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]
 
@@ -230,11 +236,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
              possible. Changes from v3 to v4 (r1853953 mainly, r1853956 is only
              comment) are non functional (or at least intended as such).
 
-   *) core: merge consecutive slashes in the path
-      trunk patch http://svn.apache.org/r1855705
-      2.4.x patch: http://people.apache.org/~covener/patches/mergeslashes-2.4.diff
-   +1: covener, rpluem
-
 
 PATCHES/ISSUES THAT ARE BEING WORKED
   [ New entries should be added at the START of the list ]