Vote, promote.

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

diff --git a/STATUS b/STATUS
index ea6f6144413b5b66eb9be9ee1ff6bb4ed7bb3de5..19fe4d62e1d5e62f61e8b13abf9731feb6d71f15 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -97,6 +97,15 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
+  * slotmem_shm: Error detection
+    trunk patch: https://svn.apache.org/viewvc?view=revision&revision=1540161
+                 https://svn.apache.org/viewvc?view=revision&revision=1540163
+                 https://svn.apache.org/viewvc?view=revision&revision=1540178
+                 https://svn.apache.org/viewvc?view=revision&revision=1540179
+                 https://svn.apache.org/viewvc?view=revision&revision=1540220
+                 http://svn.apache.org/viewvc?view=revision&revision=r1542413
+    2.4.x patch: http://people.apache.org/~jim/patches/slotmem-error2.patch
+    +1: jim, jorton, minfrin
 
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
@@ -148,18 +157,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
              without mod_request and mod_session present would cause the very
              same failure. Would a warning in the release notes be good enough?
 
-  * slotmem_shm: Error detection
-    trunk patch: https://svn.apache.org/viewvc?view=revision&revision=1540161
-                 https://svn.apache.org/viewvc?view=revision&revision=1540163
-                 https://svn.apache.org/viewvc?view=revision&revision=1540178
-                 https://svn.apache.org/viewvc?view=revision&revision=1540179
-                 https://svn.apache.org/viewvc?view=revision&revision=1540220
-                 http://svn.apache.org/viewvc?view=revision&revision=r1542413
-    2.4.x patch: http://people.apache.org/~jim/patches/slotmem-error2.patch
-    +1: jim, jorton
-    minfrin: 2.4.x patch fails to apply for me.
-    jim: slotmem-error2.patch fixes the .rej issue and add's the _full patch
-
   * mod_proxy: support Unix domain sockets
     trunk patch: https://svn.apache.org/viewvc?view=revision&revision=1451633
                  https://svn.apache.org/viewvc?view=revision&revision=1451905