From: Paul Querna <pquerna@apache.org>
Date: Fri, 4 Feb 2005 05:40:38 +0000 (+0000)
Subject: Someone voted right before me.. and made nasty conflicts all around. Oh well.
X-Git-Tag: 2.0.53~27
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2ae9f0af86defcdd0540f9ae310234fe9436c3e2;p=thirdparty%2Fapache%2Fhttpd.git

Someone voted right before me.. and made nasty conflicts all around. Oh well.


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

diff --git a/STATUS b/STATUS
index e9fcc77a9e2..0f09f8c5829 100644
--- a/STATUS
+++ b/STATUS
@@ -116,7 +116,7 @@ PATCHES TO BACKPORT FROM 2.1
        build now requires system installations of APR and APR-util.
        http://svn.apache.org/~minfrin/httpd-2.0.53-rpm.diff
        svn rev 122711
-       +1: minfrin
+       +1: minfrin, pquerna
        -0: jorton: users could rely on it working as-is; make it conditional?
        minfrin: The existing spec file in the tree does not work, so not
                 applying this patch means we have no RPMs at all.
@@ -239,6 +239,7 @@ PATCHES TO BACKPORT FROM 2.1
           modules/ssl/ssl_private.h: r1.2
        +1: bnicholes, wrowe                             
        -0: jerenkrantz (should wait for 2.2)
+       -0: pquerna (2.2)
        -0: jorton (msgid <20040305083540.GA24529@redhat.com>)
 
     * Replace some of the mutex locking in the worker MPM with
@@ -370,11 +371,10 @@ PATCHES TO BACKPORT FROM 2.1
 
     * mod_proxy: Fix ProxyRemoteMatch.  PR 33170.
       svn rev 151248
-      +1: jerenkrantz, trawick, fielding
+      +1: jerenkrantz, trawick, fielding, pquerna
 
     * Fix --with-apr=/usr and/or --with-apr-util=/usr.  PR 29740.
-      svn rev 151255
-      +1: jerenkrantz, trawick, fielding
+      +1: jerenkrantz, trawick, fielding, pquerna
 
 CURRENT RELEASE NOTES: