Promote

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

diff --git a/STATUS b/STATUS
index 36cd7a25927d80fbca3819d558600e0adbe68bd6..deffa4aa3066230c1d2c272b86bc175b772c43f1 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -132,6 +132,27 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
+  *) Easy patches: synch 2.4.x and trunk
+        - core: print r->uri during failure
+        - core: Call va_end before returning in the error case
+        - mod_cache_disk: fix a Coverity warning
+        - core: Provide TEST_CHAR macro in test_char.h
+        - tag some pools
+        - core: Fix a signed/unsigned comparison that can never match
+        - mod_session: leave a hint about session expiration at TRACE2
+        - mod_ssl: Fix a typo
+     trunk patch:
+        - http://svn.apache.org/r1787229
+        - http://svn.apache.org/r1842919
+        - http://svn.apache.org/r1842926
+        - http://svn.apache.org/r1856490
+        - http://svn.apache.org/r1862051
+        - http://svn.apache.org/r1864865
+        - http://svn.apache.org/r1865871
+        - http://svn.apache.org/r1867256
+     2.4.x patch: svn merge -c 1787229,1842919,1842926,1856490,1862051,1864865,1865871,1867256 ^/httpd/httpd/trunk . 
+     +1: jailletc36, jim, ylavic
+
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]
@@ -183,27 +204,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
                   https://lists.apache.org/thread.html/628cc54a1a345cb773d8e1be0639f8e75d2b481cf89232051c83b787@%3Cdev.httpd.apache.org%3E
              jim: The problem still exists because this is NOT back ported yet. With this back port, the problem goes away.
 
-  *) Easy patches: synch 2.4.x and trunk
-        - core: print r->uri during failure
-        - core: Call va_end before returning in the error case
-        - mod_cache_disk: fix a Coverity warning
-        - core: Provide TEST_CHAR macro in test_char.h
-        - tag some pools
-        - core: Fix a signed/unsigned comparison that can never match
-        - mod_session: leave a hint about session expiration at TRACE2
-        - mod_ssl: Fix a typo
-     trunk patch:
-        - http://svn.apache.org/r1787229
-        - http://svn.apache.org/r1842919
-        - http://svn.apache.org/r1842926
-        - http://svn.apache.org/r1856490
-        - http://svn.apache.org/r1862051
-        - http://svn.apache.org/r1864865
-        - http://svn.apache.org/r1865871
-        - http://svn.apache.org/r1867256
-     2.4.x patch: svn merge -c 1787229,1842919,1842926,1856490,1862051,1864865,1865871,1867256 ^/httpd/httpd/trunk . 
-     +1: jailletc36, jim, ylavic
-
   *) Easy patches: synch 2.4.x and trunk
         - core: Fix a comment
         - mod_auth_form: use the provided types via the macro