From: Eric Covener <covener@apache.org>
Date: Sun, 6 Sep 2015 21:25:14 +0000 (+0000)
Subject: some easy votes/promotes
X-Git-Tag: 2.4.17~151
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2b2b8002f7b674f1c121edfe7dcb166590d93757;p=thirdparty%2Fapache%2Fhttpd.git

some easy votes/promotes


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

diff --git a/STATUS b/STATUS
index 0a72cba155f..f43f94da90b 100644
--- a/STATUS
+++ b/STATUS
@@ -109,6 +109,38 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
+  *) mod_socache_memcache: Add the 'MemcacheConnTTL' directive to control how 
+     long to keep idle connections with the memcache server(s).
+     Change default value from 600 usec (!) to 15 sec.  PR 58091
+     Measurements available in the svn commit message.
+     trunk: http://svn.apache.org/r1696105
+            http://svn.apache.org/r1700418
+     2.4.x: http://people.apache.org/~jailletc36/socache_memcache.diff
+     +1: jailletc36, ylavic, covener
+     covener: please add compatibility tag to doc during backport
+     jailletc36: done in r1700418
+
+
+  *) Fix some spurious and/or inconsistant indent spotted by sparse
+     Fix some minor style issues.
+     trunk: http://svn.apache.org/r1700317
+            http://svn.apache.org/r1700318
+            http://svn.apache.org/r1700319
+            http://svn.apache.org/r1700320
+            http://svn.apache.org/r1700321
+            http://svn.apache.org/r1700322
+            http://svn.apache.org/r1700326
+            http://svn.apache.org/r1700328
+            http://svn.apache.org/r1700330
+            http://svn.apache.org/r1700331
+            http://svn.apache.org/r1700332
+            http://svn.apache.org/r1700334
+            http://svn.apache.org/r1700336
+            http://svn.apache.org/r1700338
+     2.4.x: http://people.apache.org/~jailletc36/sparse.diff
+     +1: jailletc36, ylavic, covener
+     jailletc36: To ease review http://people.apache.org/~jailletc36/sparse_nospace.diff
+                 is the same file as above but generated using svn diff -x --ignore-all-space
 
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
@@ -315,17 +347,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
      +1: icing, jim
 
 
-  *) mod_socache_memcache: Add the 'MemcacheConnTTL' directive to control how 
-     long to keep idle connections with the memcache server(s).
-     Change default value from 600 usec (!) to 15 sec.  PR 58091
-     Measurements available in the svn commit message.
-     trunk: http://svn.apache.org/r1696105
-            http://svn.apache.org/r1700418
-     2.4.x: http://people.apache.org/~jailletc36/socache_memcache.diff
-     +1: jailletc36, ylavic
-     covener: please add compatibility tag to doc during backport
-     jailletc36: done in r1700418
-
   *) mod_rewrite: Fix an harmless error spotted by sparse.
      trunk: http://svn.apache.org/r1697735
      2.4.x: trunk patch applies.
@@ -333,26 +354,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
      ylavic: I'd prefer the unambiguous parentheses in the macros definitions,
              as you suggested on dev@.
 
-  *) Fix some spurious and/or inconsistant indent spotted by sparse
-     Fix some minor style issues.
-     trunk: http://svn.apache.org/r1700317
-            http://svn.apache.org/r1700318
-            http://svn.apache.org/r1700319
-            http://svn.apache.org/r1700320
-            http://svn.apache.org/r1700321
-            http://svn.apache.org/r1700322
-            http://svn.apache.org/r1700326
-            http://svn.apache.org/r1700328
-            http://svn.apache.org/r1700330
-            http://svn.apache.org/r1700331
-            http://svn.apache.org/r1700332
-            http://svn.apache.org/r1700334
-            http://svn.apache.org/r1700336
-            http://svn.apache.org/r1700338
-     2.4.x: http://people.apache.org/~jailletc36/sparse.diff
-     +1: jailletc36, ylavic
-     jailletc36: To ease review http://people.apache.org/~jailletc36/sparse_nospace.diff
-                 is the same file as above but generated using svn diff -x --ignore-all-space
 
   *) Allow autoindexes to work without mod_dir or mod_mime
      trunk: http://svn.apache.org/r1701436