From: Nick Kew <niq@apache.org>
Date: Wed, 25 Jan 2006 19:15:40 +0000 (+0000)
Subject: vote + promote
X-Git-Tag: 2.2.1~114
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=653e66b43eebde82d07f3992168e80290596c038;p=thirdparty%2Fapache%2Fhttpd.git

vote + promote


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

diff --git a/STATUS b/STATUS
index 7d0ba3a930f..f0cec1f4f04 100644
--- a/STATUS
+++ b/STATUS
@@ -95,6 +95,12 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
       Message-ID: <4395A056.2070000@web.turner.com>
       +1: jerenkrantz, jim, wrowe
 
+    * Fix for AP_HAVE_DESIGNATED_INITIALIZER vs C++ compilers
+         http://svn.apache.org/viewcvs?rev=356234&view=rev
+       + http://svn.apache.org/viewcvs?rev=356248&view=rev
+       = http://people.apache.org/~jorton/httpd-2.2.0-cppheader.patch
+      +1: jorton, wrowe, niq
+
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
 
     * mod_dbd: When threaded, create a private pool in child_init
@@ -143,12 +149,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
       http://people.apache.org/~rpluem/patches/partial_2.2.diff
       +1: jim, rpluem
 
-    * Fix for AP_HAVE_DESIGNATED_INITIALIZER vs C++ compilers
-         http://svn.apache.org/viewcvs?rev=356234&view=rev
-       + http://svn.apache.org/viewcvs?rev=356248&view=rev
-       = http://people.apache.org/~jorton/httpd-2.2.0-cppheader.patch
-      +1: jorton, wrowe
-
     * Fix mis-shifted 32 bit scope, masked to 64 bits as a method.
         URL: http://svn.apache.org/viewcvs?rev=358040&view=rev
       +1: wrowe, mturk