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 379301026A for ; Tue, 4 Feb 2014 17:02:16 +0000 (UTC) Received: (qmail 89044 invoked by uid 500); 4 Feb 2014 17:02:14 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 89018 invoked by uid 500); 4 Feb 2014 17:02:14 -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 88978 invoked by uid 99); 4 Feb 2014 17:02:13 -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, 04 Feb 2014 17:02:13 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 2701E314F84; Tue, 4 Feb 2014 17:02:13 +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, 04 Feb 2014 17:02:15 -0000 Message-Id: <13a5f087c47e473d9474112953cef8f5@git.apache.org> In-Reply-To: <2ee97515edbb4949a779fa6e68552333@git.apache.org> References: <2ee97515edbb4949a779fa6e68552333@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [3/3] git commit: Merge branch 'cassandra-2.0' into trunk Merge branch 'cassandra-2.0' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c947c126 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c947c126 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c947c126 Branch: refs/heads/trunk Commit: c947c126f0893f214cae26e8b199a88618e4d6f7 Parents: 0842681 723fcd1 Author: Brandon Williams Authored: Tue Feb 4 11:00:15 2014 -0600 Committer: Brandon Williams Committed: Tue Feb 4 11:00:15 2014 -0600 ---------------------------------------------------------------------- ----------------------------------------------------------------------