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 5AC3317EFE for ; Thu, 16 Oct 2014 16:52:10 +0000 (UTC) Received: (qmail 22169 invoked by uid 500); 16 Oct 2014 16:52:09 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 21962 invoked by uid 500); 16 Oct 2014 16:52:09 -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 21652 invoked by uid 99); 16 Oct 2014 16:52:09 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 16 Oct 2014 16:52:09 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 651869CA517; Thu, 16 Oct 2014 16:52:09 +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: Thu, 16 Oct 2014 16:52:14 -0000 Message-Id: In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [6/6] 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/ed1f3948 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ed1f3948 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ed1f3948 Branch: refs/heads/trunk Commit: ed1f39480606c95ff6595aad0aad9c1af7460f74 Parents: 4eb6535 d4a7d58 Author: Brandon Williams Authored: Thu Oct 16 11:52:02 2014 -0500 Committer: Brandon Williams Committed: Thu Oct 16 11:52:02 2014 -0500 ---------------------------------------------------------------------- ----------------------------------------------------------------------