Return-Path: X-Original-To: apmail-cassandra-commits-archive@www.apache.org Delivered-To: apmail-cassandra-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 710FACF33 for ; Fri, 25 Jan 2013 20:27:58 +0000 (UTC) Received: (qmail 47881 invoked by uid 500); 25 Jan 2013 20:27:58 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 47856 invoked by uid 500); 25 Jan 2013 20:27:58 -0000 Mailing-List: contact commits-help@cassandra.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cassandra.apache.org Delivered-To: mailing list commits@cassandra.apache.org Received: (qmail 47837 invoked by uid 99); 25 Jan 2013 20:27:58 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 25 Jan 2013 20:27:58 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id F02F6825564; Fri, 25 Jan 2013 20:27:57 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: brandonwilliams@apache.org To: commits@cassandra.apache.org X-Mailer: ASF-Git Admin Mailer Subject: [9/9] git commit: Merge branch 'cassandra-1.2' into trunk Message-Id: <20130125202757.F02F6825564@tyr.zones.apache.org> Date: Fri, 25 Jan 2013 20:27:57 +0000 (UTC) Updated Branches: refs/heads/cassandra-1.1 9c8d94930 -> 3298c2f19 refs/heads/cassandra-1.2 8540974db -> f4a941e49 refs/heads/trunk 6a15bb37b -> b7ba0a917 Merge branch 'cassandra-1.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b7ba0a91 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b7ba0a91 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b7ba0a91 Branch: refs/heads/trunk Commit: b7ba0a917736088c2c6e94396487d28008f71b18 Parents: 6a15bb3 f4a941e Author: Brandon Williams Authored: Fri Jan 25 14:27:44 2013 -0600 Committer: Brandon Williams Committed: Fri Jan 25 14:27:44 2013 -0600 ---------------------------------------------------------------------- CHANGES.txt | 4 +++ build.xml | 2 +- debian/changelog | 6 +++++ .../cassandra/io/util/PoolingSegmentedFile.java | 17 +++++++++++++++ .../apache/cassandra/thrift/ThriftValidation.java | 2 +- .../apache/cassandra/utils/SemanticVersion.java | 2 +- .../cassandra/utils/SemanticVersionTest.java | 2 +- 7 files changed, 31 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/b7ba0a91/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/b7ba0a91/build.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/b7ba0a91/src/java/org/apache/cassandra/thrift/ThriftValidation.java ----------------------------------------------------------------------