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 6793E18F9C for ; Fri, 18 Dec 2015 22:49:41 +0000 (UTC) Received: (qmail 7868 invoked by uid 500); 18 Dec 2015 22:49:40 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 7810 invoked by uid 500); 18 Dec 2015 22:49:40 -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 7478 invoked by uid 99); 18 Dec 2015 22:49:40 -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, 18 Dec 2015 22:49:40 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 92681E0948; Fri, 18 Dec 2015 22:49:40 +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: Fri, 18 Dec 2015 22:49:44 -0000 Message-Id: <7a5c68928a524971ac9906e9b960cc7e@git.apache.org> In-Reply-To: <00fdfe73f7e04133aaa4e67dba05bb3a@git.apache.org> References: <00fdfe73f7e04133aaa4e67dba05bb3a@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [5/6] 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/2e095833 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2e095833 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2e095833 Branch: refs/heads/cassandra-3.0 Commit: 2e095833d9a45a6f1032b8beac2d94a47409a5e0 Parents: d877ba0 9dd2b5e Author: Aleksey Yeschenko Authored: Fri Dec 18 22:48:12 2015 +0000 Committer: Aleksey Yeschenko Committed: Fri Dec 18 22:48:12 2015 +0000 ---------------------------------------------------------------------- bin/cqlsh.py | 4 +- pylib/cqlshlib/test/run_cqlsh.py | 108 +++++++++++++++------- pylib/cqlshlib/test/test_cqlsh_completion.py | 3 + pylib/cqlshlib/test/test_cqlsh_output.py | 22 +++-- pylib/cqlshlib/test/winpty.py | 50 ++++++++++ 5 files changed, 144 insertions(+), 43 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/2e095833/bin/cqlsh.py ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/2e095833/pylib/cqlshlib/test/test_cqlsh_completion.py ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/2e095833/pylib/cqlshlib/test/test_cqlsh_output.py ----------------------------------------------------------------------