Return-Path: Delivered-To: apmail-httpd-cvs-archive@www.apache.org Received: (qmail 32212 invoked from network); 29 Nov 2005 01:56:43 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 29 Nov 2005 01:56:43 -0000 Received: (qmail 40377 invoked by uid 500); 29 Nov 2005 01:56:42 -0000 Delivered-To: apmail-httpd-cvs-archive@httpd.apache.org Received: (qmail 40341 invoked by uid 500); 29 Nov 2005 01:56:42 -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 40330 invoked by uid 99); 29 Nov 2005 01:56:41 -0000 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.29) with SMTP; Mon, 28 Nov 2005 17:56:41 -0800 Received: (qmail 32070 invoked by uid 65534); 29 Nov 2005 01:56:21 -0000 Message-ID: <20051129015621.32068.qmail@minotaur.apache.org> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r349585 - in /httpd/httpd/branches/2.2.x: STATUS include/ap_release.h Date: Tue, 29 Nov 2005 01:56:21 -0000 To: cvs@httpd.apache.org From: pquerna@apache.org X-Mailer: svnmailer-1.0.5 X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: pquerna Date: Mon Nov 28 17:56:19 2005 New Revision: 349585 URL: http://svn.apache.org/viewcvs?rev=349585&view=rev Log: Roll on to 2.2.1-dev Modified: httpd/httpd/branches/2.2.x/STATUS httpd/httpd/branches/2.2.x/include/ap_release.h Modified: httpd/httpd/branches/2.2.x/STATUS URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/2.2.x/STATUS?rev=349585&r1=349584&r2=349585&view=diff ============================================================================== --- httpd/httpd/branches/2.2.x/STATUS (original) +++ httpd/httpd/branches/2.2.x/STATUS Mon Nov 28 17:56:19 2005 @@ -24,8 +24,9 @@ Release history: [NOTE that only Alpha/Beta releases occur in 2.1 development] - 2.1.11 : in development - 2.1.10 : Tagged on November 19, 2005. + 2.2.1 : in development + 2.2.0 : Released on ?, ? 2005. + 2.1.10 : Tagged on November 19, 2005, voted to 2.2.0. 2.1.9 : Released on November 5, 2005 as beta. 2.1.8 : Released on October 1, 2005 as beta. 2.1.7 : Released on September 12, 2005 as beta. Modified: httpd/httpd/branches/2.2.x/include/ap_release.h URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/2.2.x/include/ap_release.h?rev=349585&r1=349584&r2=349585&view=diff ============================================================================== --- httpd/httpd/branches/2.2.x/include/ap_release.h (original) +++ httpd/httpd/branches/2.2.x/include/ap_release.h Mon Nov 28 17:56:19 2005 @@ -46,8 +46,8 @@ #define AP_SERVER_BASEPRODUCT "Apache" #define AP_SERVER_MAJORVERSION_NUMBER 2 -#define AP_SERVER_MINORVERSION_NUMBER 1 -#define AP_SERVER_PATCHLEVEL_NUMBER 11 +#define AP_SERVER_MINORVERSION_NUMBER 2 +#define AP_SERVER_PATCHLEVEL_NUMBER 1 #define AP_SERVER_DEVBUILD_BOOLEAN 1 #if AP_SERVER_DEVBUILD_BOOLEAN