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 CEE2F186ED for ; Tue, 25 Aug 2015 15:03:54 +0000 (UTC) Received: (qmail 94517 invoked by uid 500); 25 Aug 2015 15:03:54 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 94415 invoked by uid 500); 25 Aug 2015 15:03:54 -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 94039 invoked by uid 99); 25 Aug 2015 15:03:54 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 25 Aug 2015 15:03:54 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 12F7BE3612; Tue, 25 Aug 2015 15:03:54 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: tylerhobbs@apache.org To: commits@cassandra.apache.org Date: Tue, 25 Aug 2015 15:03:58 -0000 Message-Id: <52cd13f735f14bc28b732aa97c9bdd0c@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [5/9] cassandra git commit: Merge branch 'cassandra-2.1' into cassandra-2.2 Merge branch 'cassandra-2.1' into cassandra-2.2 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/d526536f Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d526536f Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d526536f Branch: refs/heads/trunk Commit: d526536f288c1851724c0d769f9ebfdabc57d028 Parents: a69558b 7d74563 Author: T Jake Luciani Authored: Tue Aug 25 09:40:30 2015 -0400 Committer: T Jake Luciani Committed: Tue Aug 25 09:40:30 2015 -0400 ---------------------------------------------------------------------- ----------------------------------------------------------------------