Merge branch 'cassandra-2.1' into trunk

2014-08-12 17:45:22 +03:00 · 2014-08-12 17:45:22 +03:00 · 78142080dd
parent 54914bf742 d71c8aa884
commit 78142080dd
2 changed files with 1 additions and 0 deletions
--- a/CHANGES.txt
+++ b/CHANGES.txt
@ -38,6 +38,7 @@ Merged from 2.0:


 2.1.0-rc6
+ * (cqlsh) Fix DESCRIBE for NTS keyspaces (CASSANDRA-7729)
 * Remove netty buffer ref-counting (CASSANDRA-7735)
 * Pass mutated cf to index updater for use by PRSI (CASSANDRA-7742)
 * Include stress yaml example in release and deb (CASSANDRA-7717)
--- a/lib/cassandra-driver-internal-only-2.1.0c1.post.zip
+++ b/lib/cassandra-driver-internal-only-2.1.0c1.post.zip