From a14324712e542559439bee1c0f49fcaa9521e208 Mon Sep 17 00:00:00 2001
From: Graham Leggett <minfrin@apache.org>
Date: Thu, 13 Jun 2013 13:20:11 +0000
Subject: [PATCH] Propose.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1492666 13f79535-47bb-0310-9956-ffa450edef68
---
 STATUS | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/STATUS b/STATUS
index ba8edac4aa..2ce8bf7141 100644
--- a/STATUS
+++ b/STATUS
@@ -205,6 +205,12 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
       +1: sf, covener
       -1: nd
 
+    * mod_cache_socache: Make sure the CacheSocacheMaxSize directive is merged
+      correctly.
+      trunk patch: http://svn.apache.org/r1492663
+      2.4.x patch: trunk patch works modulo CHANGES
+      +1: minfrin
+
 
 A list of further possible backports can be found at:                                                                                                                                   
     http://people.apache.org/~rjung/patches/possible-backports-httpd-trunk-2_4.txt
-- 
2.40.0