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 DE53610CA7 for ; Mon, 12 May 2014 09:21:55 +0000 (UTC) Received: (qmail 65005 invoked by uid 500); 10 May 2014 21:56:29 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 58492 invoked by uid 500); 10 May 2014 21:56:13 -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 56320 invoked by uid 99); 10 May 2014 21:56:08 -0000 Received: from Unknown (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 10 May 2014 21:56:08 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id DCF5A9836F9; Thu, 8 May 2014 22:34:58 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: mishail@apache.org To: commits@cassandra.apache.org Date: Thu, 08 May 2014 22:35:05 -0000 Message-Id: In-Reply-To: <3ce63a43638240c89ee9ecbefe116096@git.apache.org> References: <3ce63a43638240c89ee9ecbefe116096@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [8/8] 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/211d81c2 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/211d81c2 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/211d81c2 Branch: refs/heads/trunk Commit: 211d81c24db2da25bc52913a380430df47e72bcc Parents: cbacf85 5613694 Author: Mikhail Stepura Authored: Thu May 8 15:34:33 2014 -0700 Committer: Mikhail Stepura Committed: Thu May 8 15:34:33 2014 -0700 ---------------------------------------------------------------------- CHANGES.txt | 1 + bin/cqlsh | 23 ++++++++++++++++++----- 2 files changed, 19 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/211d81c2/CHANGES.txt ----------------------------------------------------------------------