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 EA3D819A87 for ; Wed, 30 Mar 2016 21:52:33 +0000 (UTC) Received: (qmail 91179 invoked by uid 500); 30 Mar 2016 21:52:33 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 91104 invoked by uid 500); 30 Mar 2016 21:52: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 90798 invoked by uid 99); 30 Mar 2016 21:52:32 -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, 30 Mar 2016 21:52:32 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id B2DD2E38E3; Wed, 30 Mar 2016 21:52:32 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: yukim@apache.org To: commits@cassandra.apache.org Date: Wed, 30 Mar 2016 21:52:37 -0000 Message-Id: In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [06/15] 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/1dac59d1 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1dac59d1 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1dac59d1 Branch: refs/heads/trunk Commit: 1dac59d1e75102480a1cb4575cd5c0c30ba6c8c0 Parents: 6ff0065 105fbb3 Author: Yuki Morishita Authored: Wed Mar 30 16:51:35 2016 -0500 Committer: Yuki Morishita Committed: Wed Mar 30 16:51:35 2016 -0500 ---------------------------------------------------------------------- ----------------------------------------------------------------------