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 08C1E19D71 for ; Fri, 15 Apr 2016 14:47:03 +0000 (UTC) Received: (qmail 9998 invoked by uid 500); 15 Apr 2016 14:47:01 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 9859 invoked by uid 500); 15 Apr 2016 14:47:01 -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 9540 invoked by uid 99); 15 Apr 2016 14:47:01 -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, 15 Apr 2016 14:47:01 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 82F39E1073; Fri, 15 Apr 2016 14:47:01 +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: Fri, 15 Apr 2016 14:47:10 -0000 Message-Id: <3ea59e056e404f0ca4b67906a7b75ff0@git.apache.org> In-Reply-To: <804019ad2e1b4f4eaff4947f7c31523b@git.apache.org> References: <804019ad2e1b4f4eaff4947f7c31523b@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [10/13] 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/37f63ecc Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/37f63ecc Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/37f63ecc Branch: refs/heads/cassandra-2.2 Commit: 37f63ecc5d3b36fc115fd7ae98e4fc1f4bc2d1d6 Parents: 220e4f6 5c5c5b4 Author: T Jake Luciani Authored: Fri Apr 15 10:34:48 2016 -0400 Committer: T Jake Luciani Committed: Fri Apr 15 10:34:48 2016 -0400 ---------------------------------------------------------------------- ----------------------------------------------------------------------