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 1DF1218D66 for ; Wed, 8 Jul 2015 17:23:17 +0000 (UTC) Received: (qmail 15681 invoked by uid 500); 8 Jul 2015 17:23:15 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 15606 invoked by uid 500); 8 Jul 2015 17:23:15 -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 14852 invoked by uid 99); 8 Jul 2015 17:23:15 -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, 08 Jul 2015 17:23:15 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id BBD71E10D0; Wed, 8 Jul 2015 17:23:14 +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, 08 Jul 2015 17:23:20 -0000 Message-Id: <48fa516de13049ce88b0742fd62de589@git.apache.org> In-Reply-To: <57dd33f5ec9f409db1b8f2c090f30dba@git.apache.org> References: <57dd33f5ec9f409db1b8f2c090f30dba@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [07/10] cassandra git commit: Merge branch 'cassandra-2.0' into cassandra-2.1 Merge branch 'cassandra-2.0' into cassandra-2.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/fe7a7a7f Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/fe7a7a7f Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/fe7a7a7f Branch: refs/heads/trunk Commit: fe7a7a7f9f295138d78805c00ed4923c8f0d5ae1 Parents: 58599a9 7cebd0e Author: Yuki Morishita Authored: Wed Jul 8 12:21:08 2015 -0500 Committer: Yuki Morishita Committed: Wed Jul 8 12:21:08 2015 -0500 ---------------------------------------------------------------------- ----------------------------------------------------------------------