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 C3B8011164 for ; Fri, 25 Apr 2014 22:01:42 +0000 (UTC) Received: (qmail 1727 invoked by uid 500); 25 Apr 2014 22:01:41 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 1578 invoked by uid 500); 25 Apr 2014 22:01:40 -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 1524 invoked by uid 99); 25 Apr 2014 22:01:39 -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 Apr 2014 22:01:39 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id D7E079526F7; Fri, 25 Apr 2014 22:01:38 +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: Fri, 25 Apr 2014 22:01:40 -0000 Message-Id: <827174139782401cb1a6a5b3d7ebfe14@git.apache.org> In-Reply-To: <3d42bbed80844a82a68e47ea7902d0ee@git.apache.org> References: <3d42bbed80844a82a68e47ea7902d0ee@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [3/4] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1 Merge branch 'cassandra-2.0' into cassandra-2.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/3a0cd65f Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3a0cd65f Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3a0cd65f Branch: refs/heads/trunk Commit: 3a0cd65f339f5771229e058a13396ea5763276af Parents: 7c0c34b e974b6f Author: Brandon Williams Authored: Fri Apr 25 16:57:32 2014 -0500 Committer: Brandon Williams Committed: Fri Apr 25 16:57:32 2014 -0500 ---------------------------------------------------------------------- ----------------------------------------------------------------------