You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by jb...@apache.org on 2014/07/01 06:13:46 UTC
[08/10] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1
Merge branch 'cassandra-2.1.0' into cassandra-2.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ba3a1ba6
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ba3a1ba6
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ba3a1ba6
Branch: refs/heads/trunk
Commit: ba3a1ba615c65b8a8619685249a934863bc28bb3
Parents: 3ae5559 c23eccf
Author: Jonathan Ellis <jb...@apache.org>
Authored: Mon Jun 30 21:13:09 2014 -0700
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Mon Jun 30 21:13:09 2014 -0700
----------------------------------------------------------------------
CHANGES.txt | 2 ++
lib/snappy-java-1.0.5.1.jar | Bin 1280090 -> 0 bytes
lib/snappy-java-1.0.5.2.jar | Bin 0 -> 1339383 bytes
3 files changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/ba3a1ba6/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index a32fbea,c19690b..e65a065
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -19,8 -13,9 +19,10 @@@ 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
* Fix heap size calculation for CompoundSparseCellName and
CompoundSparseCellName.WithCollection (CASSANDRA-7421)