Promote

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

diff --git a/STATUS b/STATUS
index 643d32d2f6404f3fc55f17ceb32b2620843220e7..cf5c4d22891653b1dd2bbe26227cb75f1a6f62bf 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -88,7 +88,23 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
+* Axe unnecessary trailing comma from server-status user output.
+     trunk patch: http://svn.apache.org/viewvc?view=rev&rev=1369904
+     2.4.x patch: trunk patch works
+     +1: rjung, trawick, humbedooh
+
+   * mpm_winnt: Tweak a message added in r750567 so that the accept thread
+     logs the physical address it listens on instead of hostname|*.
+     trunk patch: http://svn.apache.org/viewvc?view=rev&rev=1364138
+     2.4.x patch: trunk patch works
+     +1: rjung, trawick, humbedooh
 
+   * htpasswd: Use correct file mode for checking if file is writable.
+     Also switch to the non-deprecated APR_FOPEN_* flags.
+     PR: 45923
+     trunk patch: http://svn.apache.org/viewvc?view=rev&rev=1369618
+     2.4.x patch: trunk patch works
+     +1: rjung, trawick, humbedooh
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]
@@ -203,29 +219,11 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
                to be set for apps/logging, and it allows the same treatment
                to be applied to other user agents that go bad.
 
-   * Axe unnecessary trailing comma from server-status user output.
-     trunk patch: http://svn.apache.org/viewvc?view=rev&rev=1369904
-     2.4.x patch: trunk patch works
-     +1: rjung, trawick, humbedooh
-
    * Correctly log the error returned by apr_dbd_pvselect().
      trunk patch: http://svn.apache.org/viewvc?view=rev&rev=1364229
      2.4.x patch: trunk patch works
      +1: rjung, trawick
 
-   * mpm_winnt: Tweak a message added in r750567 so that the accept thread
-     logs the physical address it listens on instead of hostname|*.
-     trunk patch: http://svn.apache.org/viewvc?view=rev&rev=1364138
-     2.4.x patch: trunk patch works
-     +1: rjung, trawick, humbedooh
-
-   * htpasswd: Use correct file mode for checking if file is writable.
-     Also switch to the non-deprecated APR_FOPEN_* flags.
-     PR: 45923
-     trunk patch: http://svn.apache.org/viewvc?view=rev&rev=1369618
-     2.4.x patch: trunk patch works
-     +1: rjung, trawick, humbedooh
-
    * mod_cache: Set content type in case we return stale content.
      trunk patch: http://svn.apache.org/viewvc?view=rev&rev=1361153
      2.4.x patch: trunk patch works