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 07790117B8 for ; Tue, 29 Jul 2014 18:59:27 +0000 (UTC) Received: (qmail 63351 invoked by uid 500); 29 Jul 2014 18:59:26 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 63145 invoked by uid 500); 29 Jul 2014 18:59:26 -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 62557 invoked by uid 99); 29 Jul 2014 18:59:26 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 29 Jul 2014 18:59:26 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 8F91F821B74; Tue, 29 Jul 2014 18:59:25 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: brandonwilliams@apache.org To: commits@cassandra.apache.org Date: Tue, 29 Jul 2014 18:59:30 -0000 Message-Id: In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [06/12] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0 Merge branch 'cassandra-1.2' into cassandra-2.0 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b44bbb83 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b44bbb83 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b44bbb83 Branch: refs/heads/cassandra-2.0 Commit: b44bbb83aa997a583dbbdeb7b1375e999fac6dda Parents: a5cc16d 249bbfc Author: Brandon Williams Authored: Tue Jul 29 13:58:27 2014 -0500 Committer: Brandon Williams Committed: Tue Jul 29 13:58:27 2014 -0500 ---------------------------------------------------------------------- bin/cqlsh | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/b44bbb83/bin/cqlsh ----------------------------------------------------------------------