Merge branch 'cassandra-2.1' into trunk

2014-06-30 21:13:17 -07:00 · 2014-06-30 21:13:17 -07:00 · 36640fcac9
parent 5fe16c09ae ba3a1ba615
commit 36640fcac9
2 changed files with 2 additions and 0 deletions
--- a/CHANGES.txt
+++ b/CHANGES.txt
@ -32,6 +32,8 @@ Merged from 2.0:
 * Make sure high level sstables get compacted (CASSANDRA-7414)
 * Fix AssertionError when using empty clustering columns and static columns
   (CASSANDRA-7455)
+ * Upgrade to snappy-java 1.0.5.2 (CASSANDRA-7476)
+


 2.1.0-rc2
--- a/lib/snappy-java-1.0.5.2.jar
+++ b/lib/snappy-java-1.0.5.2.jar