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 8EC9910BC6 for ; Tue, 20 Jan 2015 15:39:51 +0000 (UTC) Received: (qmail 3478 invoked by uid 500); 20 Jan 2015 15:39:51 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 3427 invoked by uid 500); 20 Jan 2015 15:39:51 -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 3414 invoked by uid 99); 20 Jan 2015 15:39:51 -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; Tue, 20 Jan 2015 15:39:51 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id AC246E03FD; Tue, 20 Jan 2015 15:39:50 +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: Tue, 20 Jan 2015 15:39:51 -0000 Message-Id: <2865b41956544162be3716d23cc34253@git.apache.org> In-Reply-To: <5d3670bffac244ffab0db1b5a52aae44@git.apache.org> References: <5d3670bffac244ffab0db1b5a52aae44@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [2/2] cassandra git commit: Merge branch 'cassandra-2.1' into trunk Merge branch 'cassandra-2.1' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/6f51e35f Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6f51e35f Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6f51e35f Branch: refs/heads/trunk Commit: 6f51e35f583ed957fd8b85b269ed8e2532ea3854 Parents: a7a1921 5a84976 Author: Aleksey Yeschenko Authored: Tue Jan 20 18:39:00 2015 +0300 Committer: Aleksey Yeschenko Committed: Tue Jan 20 18:39:00 2015 +0300 ---------------------------------------------------------------------- ----------------------------------------------------------------------