From: Christophe Jaillet <jailletc36@apache.org>
Date: Mon, 18 Dec 2017 20:07:59 +0000 (+0000)
Subject: Fix missing reference in 'svn merge ...' command line.
X-Git-Tag: 2.4.30~212
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ded99fb6506e8aa8393880d15bf98edaf23a8298;p=apache

Fix missing reference in 'svn merge ...' command line.
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
---

diff --git a/STATUS b/STATUS
index 63abf93690..16ab574a10 100644
--- 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