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 1CFDF115E8 for ; Tue, 6 May 2014 17:35:01 +0000 (UTC) Received: (qmail 78943 invoked by uid 500); 6 May 2014 16:41:50 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 78814 invoked by uid 500); 6 May 2014 16:41:47 -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 78627 invoked by uid 99); 6 May 2014 16:41:45 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 06 May 2014 16:41:45 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 626F2935A32; Tue, 6 May 2014 16:41:44 +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 Date: Tue, 06 May 2014 16:41:50 -0000 Message-Id: <73cb938e44524966938e3d2a8dc92579@git.apache.org> In-Reply-To: <2e92361b058a4ea489cc556b277b3059@git.apache.org> References: <2e92361b058a4ea489cc556b277b3059@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [7/7] git commit: Merge branch 'cassandra-2.1' into trunk Merge branch 'cassandra-2.1' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/aae8d8cc Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/aae8d8cc Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/aae8d8cc Branch: refs/heads/trunk Commit: aae8d8cc7491d5f255c876668939a7a46b51bf76 Parents: 754643c 3d62a55 Author: Brandon Williams Authored: Tue May 6 11:37:53 2014 -0500 Committer: Brandon Williams Committed: Tue May 6 11:37:53 2014 -0500 ---------------------------------------------------------------------- CHANGES.txt | 6 +++++- NEWS.txt | 12 ++++++++++++ 2 files changed, 17 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/aae8d8cc/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/aae8d8cc/NEWS.txt ----------------------------------------------------------------------