]> granicus.if.org Git - apache/commitdiff
vote + promote
authorGregg Lewis Smith <gsmith@apache.org>
Sat, 25 Oct 2014 18:24:15 +0000 (18:24 +0000)
committerGregg Lewis Smith <gsmith@apache.org>
Sat, 25 Oct 2014 18:24:15 +0000 (18:24 +0000)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1634241 13f79535-47bb-0310-9956-ffa450edef68

STATUS

diff --git a/STATUS b/STATUS
index 495d79dc57163a723b0f07af3bfd840a2c0fc058..e23f5f98695ee2e48eec0633d884989ddfad97e2 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -115,6 +115,11 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
      2.4.x patch: http://people.apache.org/~jim/patches/worker-trunc.patch
      +1: jim, ylavic, covener
 
+   * default SSL configuration: provide sample OCSP Stapling configuration
+     trunk patch: http://svn.apache.org/r1633730
+     2.4.x patch: http://people.apache.org/~trawick/2.4.x-sample-ocsp-stapling.txt
+     +1: trawick, covener, gsmith
+
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]
 
@@ -257,11 +262,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
      ylavic: No CHANGES entry is added but rather the existing one for the same
              issue in mod_proxy_http (2.4.11's backport r1632736) has been modified.
 
-   * default SSL configuration: provide sample OCSP Stapling configuration
-     trunk patch: http://svn.apache.org/r1633730
-     2.4.x patch: http://people.apache.org/~trawick/2.4.x-sample-ocsp-stapling.txt
-     +1: trawick, covener
-
    * style fix
      trunk patch: http://svn.apache.org/r1633031
                   http://svn.apache.org/r1633522