Merge branch 'master' into 2.1-support

2014-05-30 16:50:33 -05:00
parent 375283feb8 e64a45f5ee
commit dc7259bf6a
3 changed files with 11 additions and 1 deletions
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -1,3 +1,12 @@
+2.0.2
+=====
+
+Bug Fixes
+---------
+* Add six to requirements.txt
+* Avoid KeyError during schema refresh when a keyspace is dropped
+  and TokenAwarePolicy is not in use
+
 2.0.1
 =====
 May 28, 2014
--- a/cassandra/metadata.py
+++ b/cassandra/metadata.py
@@ -970,7 +970,7 @@ class TokenMap(object):
            return None

    def remove_keyspace(self, keyspace):
-        del self.tokens_to_hosts_by_ks[keyspace]
+        self.tokens_to_hosts_by_ks.pop(keyspace, None)

    def get_replicas(self, keyspace, token):
        """
--- a/requirements.txt
+++ b/requirements.txt
@@ -1 +1,2 @@
 futures
+six >=1.6