Return-Path: X-Original-To: apmail-trafficserver-commits-archive@www.apache.org Delivered-To: apmail-trafficserver-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 74E10EE35 for ; Wed, 16 Jan 2013 18:12:40 +0000 (UTC) Received: (qmail 27657 invoked by uid 500); 16 Jan 2013 18:12:40 -0000 Delivered-To: apmail-trafficserver-commits-archive@trafficserver.apache.org Received: (qmail 27577 invoked by uid 500); 16 Jan 2013 18:12:40 -0000 Mailing-List: contact commits-help@trafficserver.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@trafficserver.apache.org Delivered-To: mailing list commits@trafficserver.apache.org Received: (qmail 27494 invoked by uid 99); 16 Jan 2013 18:12:40 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 16 Jan 2013 18:12:40 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 0C2151F6F4; Wed, 16 Jan 2013 18:12:40 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: igalic@apache.org To: commits@trafficserver.apache.org X-Mailer: ASF-Git Admin Mailer Subject: [1/2] git commit: fix CHANGES, bump version Message-Id: <20130116181240.0C2151F6F4@tyr.zones.apache.org> Date: Wed, 16 Jan 2013 18:12:40 +0000 (UTC) fix CHANGES, bump version Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/2702c77d Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/2702c77d Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/2702c77d Branch: refs/heads/3.2.x Commit: 2702c77d8cd386c4c45278f4b79c7bf47344aa61 Parents: 2069448 Author: Igor Galić Authored: Wed Jan 16 19:08:55 2013 +0100 Committer: Igor Galić Committed: Wed Jan 16 19:08:55 2013 +0100 ---------------------------------------------------------------------- CHANGES | 4 ++-- configure.ac | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/trafficserver/blob/2702c77d/CHANGES ---------------------------------------------------------------------- diff --git a/CHANGES b/CHANGES index e4f317b..6ebe908 100644 --- a/CHANGES +++ b/CHANGES @@ -1,11 +1,11 @@ -*- coding: utf-8 -*- Changes with Apache Traffic Server 3.2.4 - *) [TS-1657] to make read from writer work + *) [TS-1657] Traffic Cop doesn't wait() for its children *) [TS-1656] to make read from writer work - *) [TS-1655] RAW disk support for FreeBSD + *) [TS-1658] RAW disk support for FreeBSD *) [TS-1651] raw disk cache disabled when system start http://git-wip-us.apache.org/repos/asf/trafficserver/blob/2702c77d/configure.ac ---------------------------------------------------------------------- diff --git a/configure.ac b/configure.ac index df9e18f..f4ccc3a 100644 --- a/configure.ac +++ b/configure.ac @@ -32,8 +32,8 @@ # Version number is calculated as MAJOR * 1000000 + MINOR * 1000 + MICRO # Version string is in the form of MAJOR.MINOR.MICRO[sufix] # -m4_define([TS_VERSION_S],[3.2.3]) -m4_define([TS_VERSION_N],[3002003]) +m4_define([TS_VERSION_S],[3.2.4]) +m4_define([TS_VERSION_N],[3002004]) AC_INIT([Apache Traffic Server], TS_VERSION_S(), [dev@trafficserver.apache.org], [trafficserver],[http://trafficserver.apache.org]) AC_PREREQ([2.59])