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 1EFA218114 for ; Fri, 22 Jan 2016 18:01:34 +0000 (UTC) Received: (qmail 29376 invoked by uid 500); 22 Jan 2016 18:01:34 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 29337 invoked by uid 500); 22 Jan 2016 18:01:33 -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 29316 invoked by uid 99); 22 Jan 2016 18:01:33 -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; Fri, 22 Jan 2016 18:01:33 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 48BD9E00DC; Fri, 22 Jan 2016 18:01:33 +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: Fri, 22 Jan 2016 18:01:34 -0000 Message-Id: In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [2/2] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0 Merge branch 'cassandra-2.2' into cassandra-3.0 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/2f8e5f34 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2f8e5f34 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2f8e5f34 Branch: refs/heads/cassandra-3.0 Commit: 2f8e5f34642790f2e75573a4fc4e4e43d49b52e4 Parents: 0b05203 b4d67c9 Author: Tyler Hobbs Authored: Fri Jan 22 12:01:23 2016 -0600 Committer: Tyler Hobbs Committed: Fri Jan 22 12:01:23 2016 -0600 ---------------------------------------------------------------------- ----------------------------------------------------------------------