natas_hw
/
cassandra
mirror of https://github.com/apache/cassandra
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'cassandra-2.1.0' into cassandra-2.1

This commit is contained in:
Mikhail Stepura 2014-08-04 14:35:06 -07:00
parent 077d3ce7c7 1c3de27376
commit 1c1a40e10b
2 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES.txt
View File

@ -15,6 +15,7 @@ Merged from 2.0:
2.1.0-final
* cqlsh DESC CLUSTER fails retrieving ring information (CASSANDRA-7687)
Merged from 2.0:
* Support connecting to ipv6 jmx with nodetool (CASSANDRA-7669)

1
bin/cqlsh
View File

@ -678,6 +678,7 @@ class Shell(cmd.Cmd):
def get_ring(self):
if self.current_keyspace is None or self.current_keyspace == 'system':
raise NoKeyspaceError("Ring view requires a current non-system keyspace")
self.conn.metadata.token_map.rebuild_keyspace(self.current_keyspace, build_if_absent=True)
return self.conn.metadata.token_map.tokens_to_hosts_by_ks[self.current_keyspace]
def get_table_meta(self, ksname, tablename):