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 B3750183B0 for ; Wed, 25 Nov 2015 14:21:53 +0000 (UTC) Received: (qmail 58188 invoked by uid 500); 25 Nov 2015 14:21:53 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 58124 invoked by uid 500); 25 Nov 2015 14:21:53 -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 57966 invoked by uid 99); 25 Nov 2015 14:21:53 -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; Wed, 25 Nov 2015 14:21:53 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 5247DE1083; Wed, 25 Nov 2015 14:21:53 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: jake@apache.org To: commits@cassandra.apache.org Date: Wed, 25 Nov 2015 14:21:54 -0000 Message-Id: <9b6481c611984123aa9333182c4bbcbc@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [2/2] 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/3841f9cb Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3841f9cb Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3841f9cb Branch: refs/heads/cassandra-2.2 Commit: 3841f9cb2041a7af43cbda3ff7c85e78216a6d22 Parents: a907533 5cafe86 Author: T Jake Luciani Authored: Wed Nov 25 09:21:41 2015 -0500 Committer: T Jake Luciani Committed: Wed Nov 25 09:21:41 2015 -0500 ---------------------------------------------------------------------- ----------------------------------------------------------------------