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 6870E11BE2 for ; Mon, 18 Aug 2014 19:02:47 +0000 (UTC) Received: (qmail 63006 invoked by uid 500); 18 Aug 2014 19:02:46 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 62958 invoked by uid 500); 18 Aug 2014 19:02:46 -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 62634 invoked by uid 99); 18 Aug 2014 19:02:46 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 18 Aug 2014 19:02:46 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 6A6DD9B5F5D; Mon, 18 Aug 2014 19:02:46 +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: Mon, 18 Aug 2014 19:02:50 -0000 Message-Id: <16ad668b05174095ab387daa40ea7451@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [5/5] 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/e7d65346 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e7d65346 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e7d65346 Branch: refs/heads/trunk Commit: e7d65346c2b29cdfae68fae7bc8c96c149324c38 Parents: ddeb496 69abfaa Author: Aleksey Yeschenko Authored: Mon Aug 18 22:01:35 2014 +0300 Committer: Aleksey Yeschenko Committed: Mon Aug 18 22:01:35 2014 +0300 ---------------------------------------------------------------------- CHANGES.txt | 2 ++ bin/cqlsh | 1 + 2 files changed, 3 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/e7d65346/CHANGES.txt ----------------------------------------------------------------------