]> granicus.if.org Git - apache/commitdiff
Fix missing reference in 'svn merge ...' command line.
authorChristophe Jaillet <jailletc36@apache.org>
Mon, 18 Dec 2017 20:07:59 +0000 (20:07 +0000)
committerChristophe Jaillet <jailletc36@apache.org>
Mon, 18 Dec 2017 20:07:59 +0000 (20:07 +0000)
Suggest other commits for this backport

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

STATUS

diff --git a/STATUS b/STATUS
index 63abf936903d627bfedebb75f231253b6a1733b8..16ab574a104277a94d17f9ddbeb9934b024a591f 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -229,7 +229,9 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
                   http://svn.apache.org/r1810447
                   http://svn.apache.org/r1818280
      2.4.x patch: trunk works (modulo CHANGES)
+                  svn merge -c r1810358,r1810362,r1810363,r1810365,r1810447,r1818280 ^/httpd/httpd/trunk .
      +1: jim
+     jailletc36: r1816919, r1816922, r1818013 ?
 
   *) mod_ldap: PR61891: Failure to make progreass purging a mostly full cache.
      trunk patch: http://svn.apache.org/r1818040