From cvs-return-62685-archive-asf-public=cust-asf.ponee.io@httpd.apache.org Fri Feb 16 15:24:48 2018 Return-Path: X-Original-To: archive-asf-public@cust-asf.ponee.io Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx-eu-01.ponee.io (Postfix) with SMTP id 55442180647 for ; Fri, 16 Feb 2018 15:24:48 +0100 (CET) Received: (qmail 78278 invoked by uid 500); 16 Feb 2018 14:24: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 78269 invoked by uid 99); 16 Feb 2018 14:24:47 -0000 Received: from Unknown (HELO svn01-us-west.apache.org) (209.188.14.144) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 16 Feb 2018 14:24:47 +0000 Received: from svn01-us-west.apache.org (localhost [127.0.0.1]) by svn01-us-west.apache.org (ASF Mail Server at svn01-us-west.apache.org) with ESMTP id CF5403A00E6 for ; Fri, 16 Feb 2018 14:24:46 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1824496 - /httpd/httpd/branches/2.4.x/STATUS Date: Fri, 16 Feb 2018 14:24:46 -0000 To: cvs@httpd.apache.org From: minfrin@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20180216142446.CF5403A00E6@svn01-us-west.apache.org> Author: minfrin Date: Fri Feb 16 14:24:46 2018 New Revision: 1824496 URL: http://svn.apache.org/viewvc?rev=1824496&view=rev Log: Vote. 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=1824496&r1=1824495&r2=1824496&view=diff ============================================================================== --- httpd/httpd/branches/2.4.x/STATUS (original) +++ httpd/httpd/branches/2.4.x/STATUS Fri Feb 16 14:24:46 2018 @@ -156,7 +156,7 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK: http://svn.apache.org/r1824381 2.4.x patch: svn merge ^/httpd/httpd/branches/2.4.x-mpm_fdqueue . (http://home.apache.org/~ylavic/patches/httpd-2.4.x-mpm_fdqueue.patch) - +1: ylavic + +1: ylavic, minfrin (with mmn bump for mpm_fdqueue.h) ylavic: The branch merge helps resolve move conflicts since event and worker fdqueue.[ch] differ(ed) between 2.4.x and trunk. The patch is provided only to help review.