You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by sl...@apache.org on 2014/03/04 11:57:03 UTC
[4/5] git commit: Merge branch 'cassandra-2.1' of
https://git-wip-us.apache.org/repos/asf/cassandra into cassandra-2.1
Merge branch 'cassandra-2.1' of https://git-wip-us.apache.org/repos/asf/cassandra into cassandra-2.1
Conflicts:
CHANGES.txt
test/unit/org/apache/cassandra/io/compress/CompressedRandomAccessReaderTest.java
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/947e10fc
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/947e10fc
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/947e10fc
Branch: refs/heads/trunk
Commit: 947e10fcbacf0b163347babe0cf294037506ea4d
Parents: 724eabe 56631e1
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Tue Mar 4 11:53:05 2014 +0100
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Tue Mar 4 11:53:05 2014 +0100
----------------------------------------------------------------------
CHANGES.txt | 3 +++
.../cassandra/io/compress/CompressedRandomAccessReaderTest.java | 3 ++-
2 files changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/947e10fc/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index ba1e72b,516a0d1..7d998fc
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -35,11 -35,11 +35,14 @@@ Merged from 2.0
* Optimize single partition batch statements (CASSANDRA-6737)
* Disallow post-query re-ordering when paging (CASSANDRA-6722)
* Fix potential paging bug with deleted columns (CASSANDRA-6748)
+ * Fix NPE on BulkLoader caused by losing StreamEvent (CASSANDRA-6636)
+ * Fix truncating compression metadata (CASSANDRA-6791)
+ * Add CMSClassUnloadingEnabled JVM option (CASSANDRA-6541)
* Catch memtable flush exceptions during shutdown (CASSANDRA-6735)
* Fix upgradesstables NPE for non-CF-based indexes (CASSANDRA-6645)
+ * Fix UPDATE updating PRIMARY KEY columns implicitly (CASSANDRA-6782)
+ * Fix IllegalArgumentException when updating from 1.2 with SuperColumns
+ (CASSANDRA-6733)
2.1.0-beta1