From: Christophe Jaillet <jailletc36@apache.org>
Date: Thu, 26 Nov 2015 07:38:39 +0000 (+0000)
Subject: Easy proposal to synch 2.4.x and trunk
X-Git-Tag: 2.4.18~47
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3c381e271d1d7fc5a029ef11d9e82bcb19be4420;p=apache

Easy proposal to synch 2.4.x and trunk

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

diff --git a/STATUS b/STATUS
index a28ed7bd5d..9b3e74e820 100644
--- a/STATUS
+++ b/STATUS
@@ -158,6 +158,20 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
      2.4.x patch: trunk works (modulo CHANGES)
      +1: kbrand, icing
     
+  *) Remove some useless return statements (+ some minor style changes)
+     trunk patch: http://svn.apache.org/r1715567
+                  http://svn.apache.org/r1715568
+                  http://svn.apache.org/r1715570
+                  http://svn.apache.org/r1715571
+                  http://svn.apache.org/r1715572
+                  http://svn.apache.org/r1715576
+                  http://svn.apache.org/r1715581
+                  http://svn.apache.org/r1715582
+                  http://svn.apache.org/r1715583
+                  http://svn.apache.org/r1715584
+                  http://svn.apache.org/r1715585
+     2.4.x patch: https://people.apache.org/~jailletc36/remove_return.patch
+     +1: jailletc36
 
 PATCHES/ISSUES THAT ARE BEING WORKED