Merge branch 'cassandra-2.1' into cassandra-2.2

Conflicts: CHANGES.txt
2015-10-07 10:13:40 -04:00 · 2015-10-07 10:13:40 -04:00 · be89dae3ec
parent 1c073e70ed 1b08cbd817
commit be89dae3ec
3 changed files with 2 additions and 1 deletions
--- a/CHANGES.txt
+++ b/CHANGES.txt
@ -1,6 +1,7 @@
 2.2.3
 * Make Hadoop CF splits more polite to custom orderered partitioners (CASSANDRA-10400)
-
+Merged from 2.1:
+ * Update internal python driver used by cqlsh (CASSANDRA-10161)

 2.2.2
 * cqlsh prompt includes name of keyspace after failed `use` statement (CASSANDRA-10369)
--- a/lib/cassandra-driver-internal-only-2.6.0c2.post.zip
+++ b/lib/cassandra-driver-internal-only-2.6.0c2.post.zip
--- a/lib/cassandra-driver-internal-only-2.7.2.zip
+++ b/lib/cassandra-driver-internal-only-2.7.2.zip