Return-Path: X-Original-To: apmail-httpd-cvs-archive@www.apache.org Delivered-To: apmail-httpd-cvs-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id E3D889930 for ; Thu, 4 Oct 2012 14:01:47 +0000 (UTC) Received: (qmail 60469 invoked by uid 500); 4 Oct 2012 14:01:47 -0000 Delivered-To: apmail-httpd-cvs-archive@httpd.apache.org Received: (qmail 60395 invoked by uid 500); 4 Oct 2012 14:01:47 -0000 Mailing-List: contact cvs-help@httpd.apache.org; run by ezmlm Precedence: bulk Reply-To: dev@httpd.apache.org list-help: list-unsubscribe: List-Post: List-Id: Delivered-To: mailing list cvs@httpd.apache.org Received: (qmail 60387 invoked by uid 99); 4 Oct 2012 14:01:47 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 04 Oct 2012 14:01:47 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 04 Oct 2012 14:01:46 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 7AA7F238899C; Thu, 4 Oct 2012 14:01:03 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1394081 - /httpd/httpd/branches/2.4.x/STATUS Date: Thu, 04 Oct 2012 14:01:03 -0000 To: cvs@httpd.apache.org From: jim@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20121004140103.7AA7F238899C@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: jim Date: Thu Oct 4 14:01:03 2012 New Revision: 1394081 URL: http://svn.apache.org/viewvc?rev=1394081&view=rev Log: suggest r1394079 as the docco fix Modified: httpd/httpd/branches/2.4.x/STATUS Modified: httpd/httpd/branches/2.4.x/STATUS URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/STATUS?rev=1394081&r1=1394080&r2=1394081&view=diff ============================================================================== --- httpd/httpd/branches/2.4.x/STATUS (original) +++ httpd/httpd/branches/2.4.x/STATUS Thu Oct 4 14:01:03 2012 @@ -158,6 +158,7 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK: trunk patch: http://svn.apache.org/viewvc?view=revision&revision=1386880 http://svn.apache.org/viewvc?view=revision&revision=1387389 http://svn.apache.org/viewvc?view=revision&revision=1388445 + http://svn.apache.org/viewvc?view=revision&revision=1394079 2.4.x patch: trunk patch works +1: jim, rjung rjung: We could be more explicit in docs about the difference between grab @@ -165,7 +166,7 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK: mark as in-use" versus "grab or allocate a given slot and mark as in-use if not already used.". jim: Sounds good... We can adjust trunk as needed and then backport - since docs are CTR on the branch + since docs are CTR on the branch (Added r1394079) * mod_slotmem_shm: Fix handling of persist shm data file naming trunk patch: http://svn.apache.org/viewvc?view=revision&revision=1387085