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 018C31188E for ; Fri, 5 Sep 2014 23:48:32 +0000 (UTC) Received: (qmail 99524 invoked by uid 500); 5 Sep 2014 23:48:31 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 99411 invoked by uid 500); 5 Sep 2014 23:48:31 -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 99368 invoked by uid 99); 5 Sep 2014 23:48:31 -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, 05 Sep 2014 23:48:31 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 28245A0BB61; Fri, 5 Sep 2014 23:48:31 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: jasobrown@apache.org To: commits@cassandra.apache.org Date: Fri, 05 Sep 2014 23:48:34 -0000 Message-Id: <115dc69d8d8346fc9ce0babe1fa65eae@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [4/5] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1 Merge branch 'cassandra-2.1.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/7d215692 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7d215692 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/7d215692 Branch: refs/heads/trunk Commit: 7d215692fdc226b15a72e5459f1d0f24cee8eeda Parents: 8d69214 5d5401d Author: Jason Brown Authored: Fri Sep 5 16:47:35 2014 -0700 Committer: Jason Brown Committed: Fri Sep 5 16:47:35 2014 -0700 ---------------------------------------------------------------------- ----------------------------------------------------------------------