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 75D76187B0 for ; Wed, 14 Oct 2015 15:58:38 +0000 (UTC) Received: (qmail 22688 invoked by uid 500); 14 Oct 2015 15:57:39 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 22591 invoked by uid 500); 14 Oct 2015 15:57:39 -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 22263 invoked by uid 99); 14 Oct 2015 15:57:39 -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, 14 Oct 2015 15:57:39 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 967BDE0616; Wed, 14 Oct 2015 15:57:39 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: aleksey@apache.org To: commits@cassandra.apache.org Date: Wed, 14 Oct 2015 15:57:41 -0000 Message-Id: <5d702dd745ce44f68960ee07fbf8cbdd@git.apache.org> In-Reply-To: <0ec342654dd646ac8d3349f2277fc102@git.apache.org> References: <0ec342654dd646ac8d3349f2277fc102@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [3/3] 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/dea36bd6 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/dea36bd6 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/dea36bd6 Branch: refs/heads/cassandra-3.0 Commit: dea36bd6875634414247131b151e892d5bf42447 Parents: 0556fbf 8a94432 Author: Aleksey Yeschenko Authored: Wed Oct 14 16:57:28 2015 +0100 Committer: Aleksey Yeschenko Committed: Wed Oct 14 16:57:28 2015 +0100 ---------------------------------------------------------------------- ----------------------------------------------------------------------