Merge branch 'cassandra-2.1' into trunk

2015-04-01 13:04:17 -05:00 · 2015-04-01 13:04:17 -05:00 · addba6b56f
parent c7b02d1a6d 2fa18d3a9f
commit addba6b56f
3 changed files with 2 additions and 0 deletions
--- a/CHANGES.txt
+++ b/CHANGES.txt
@ -85,6 +85,8 @@
 * Allow scrub for secondary index (CASSANDRA-5174)

 2.1.5
+ * cqlsh: Make CompositeType data readable (CASSANDRA-8919)
+ * cqlsh: Fix display of triggers (CASSANDRA-9081)
 * Fix NullPointerException when deleting or setting an element by index on
   a null list collection (CASSANDRA-9077)
 * Buffer bloom filter serialization (CASSANDRA-9066)
--- a/lib/cassandra-driver-internal-only-2.1.4.post.zip
+++ b/lib/cassandra-driver-internal-only-2.1.4.post.zip
--- a/lib/cassandra-driver-internal-only-2.5.0.zip
+++ b/lib/cassandra-driver-internal-only-2.5.0.zip