cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mish...@apache.org
Subject [2/3] git commit: (cqlsh) Removed unused code for build number parsing
Date Sun, 03 Aug 2014 00:09:52 GMT
(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/trunk
Commit: 6b34d46c631700055b2d6629a671e23d91e46946
Parents: b2218d0
Author: Mikhail Stepura <mishail@apache.org>
Authored: Sat Aug 2 09:18:46 2014 -0700
Committer: Mikhail Stepura <mishail@apache.org>
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())


Mime
View raw message