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 DC64A10A5A for ; Fri, 16 Oct 2015 09:58:39 +0000 (UTC) Received: (qmail 36565 invoked by uid 500); 16 Oct 2015 09:58:33 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 36447 invoked by uid 500); 16 Oct 2015 09:58:33 -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 36172 invoked by uid 99); 16 Oct 2015 09:58:33 -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; Fri, 16 Oct 2015 09:58:33 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 35C75E0BBE; Fri, 16 Oct 2015 09:58:33 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: blerer@apache.org To: commits@cassandra.apache.org Date: Fri, 16 Oct 2015 09:58:35 -0000 Message-Id: <991cdff5f97943ae9dbccd7a2968c34f@git.apache.org> In-Reply-To: <0e2bc73119dc4c75b12227eeeda0c15e@git.apache.org> References: <0e2bc73119dc4c75b12227eeeda0c15e@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/f3143e62 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f3143e62 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f3143e62 Branch: refs/heads/cassandra-3.0 Commit: f3143e624cb73e86ea11dd2f9994c70008fc26aa Parents: a52597d 94a7d06 Author: blerer Authored: Fri Oct 16 11:56:46 2015 +0200 Committer: blerer Committed: Fri Oct 16 11:57:22 2015 +0200 ---------------------------------------------------------------------- pylib/cqlshlib/cql3handling.py | 8 +- pylib/cqlshlib/cqlhandling.py | 10 ++ pylib/cqlshlib/test/run_cqlsh.py | 2 +- pylib/cqlshlib/test/test_cql_parsing.py | 240 +++++++++++++-------------- 4 files changed, 137 insertions(+), 123 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/f3143e62/pylib/cqlshlib/cql3handling.py ----------------------------------------------------------------------