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 432B411B2D for ; Sun, 3 Aug 2014 00:09:52 +0000 (UTC) Received: (qmail 6680 invoked by uid 500); 3 Aug 2014 00:09:51 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 6634 invoked by uid 500); 3 Aug 2014 00:09:51 -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 6604 invoked by uid 99); 3 Aug 2014 00:09:51 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 03 Aug 2014 00:09:51 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 64E4681BF7B; Sun, 3 Aug 2014 00:09:51 +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: Sun, 03 Aug 2014 00:09:51 -0000 Message-Id: <64d2fbe91f4c422591323abdaf1841ed@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [1/3] git commit: (cqlsh) Removed unused code for build number parsing Repository: cassandra Updated Branches: refs/heads/cassandra-2.1 b2218d0d8 -> 6b34d46c6 refs/heads/trunk 4e4761ccb -> be6cf8a32 (cqlsh) Removed unused code for build number parsing patch by Mikhail Stepura; reviewed by Jonathan Ellis for CASSANDRA-7524 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/6b34d46c Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6b34d46c Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6b34d46c Branch: refs/heads/cassandra-2.1 Commit: 6b34d46c631700055b2d6629a671e23d91e46946 Parents: b2218d0 Author: Mikhail Stepura Authored: Sat Aug 2 09:18:46 2014 -0700 Committer: Mikhail Stepura Committed: Sat Aug 2 17:08:18 2014 -0700 ---------------------------------------------------------------------- CHANGES.txt | 1 + bin/cqlsh | 4 ---- 2 files changed, 1 insertion(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/6b34d46c/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index c76b310..24d3d50 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -9,6 +9,7 @@ Merged from 2.0: * (cqlsh) Add tab-completion for CREATE/DROP USER IF [NOT] EXISTS (CASSANDRA-7611) * Catch errors when the JVM pulls the rug out from GCInspector (CASSANDRA-5345) + * cqlsh fails when version number parts are not int (CASSANDRA-7524) 2.1.0-final http://git-wip-us.apache.org/repos/asf/cassandra/blob/6b34d46c/bin/cqlsh ---------------------------------------------------------------------- diff --git a/bin/cqlsh b/bin/cqlsh index 00e46b5..18db842 100755 --- a/bin/cqlsh +++ b/bin/cqlsh @@ -572,9 +572,6 @@ class Shell(cmd.Cmd): def cqlver_atleast(self, major, minor=0, patch=0): return self.cql_ver_tuple[:3] >= (major, minor, patch) - def cassandraver_atleast(self, major, minor=0, patch=0): - return self.cass_ver_tuple[:3] >= (major, minor, patch) - def myformat_value(self, val, **kwargs): if isinstance(val, DecodeError): self.decoding_errors.append(val) @@ -625,7 +622,6 @@ class Shell(cmd.Cmd): 'cql': result.cql_version, } self.connection_versions = vers - self.cass_ver_tuple = tuple(map(int, vers['build'].split('-', 1)[0].split('.')[:3])) def get_keyspace_names(self): return map(str, self.conn.metadata.keyspaces.keys())