cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From marc...@apache.org
Subject [2/2] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1
Date Wed, 12 Mar 2014 17:18:40 GMT
Merge branch 'cassandra-2.0' into cassandra-2.1

Conflicts:
	CHANGES.txt


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/019e3386
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/019e3386
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/019e3386

Branch: refs/heads/cassandra-2.1
Commit: 019e338670ecbf84fab9ae9814db0c5fcf2f1dff
Parents: cf9ae5f 05da045
Author: Marcus Eriksson <marcuse@apache.org>
Authored: Wed Mar 12 18:17:22 2014 +0100
Committer: Marcus Eriksson <marcuse@apache.org>
Committed: Wed Mar 12 18:17:22 2014 +0100

----------------------------------------------------------------------
 CHANGES.txt                                                        | 1 +
 src/java/org/apache/cassandra/db/compaction/CompactionManager.java | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/019e3386/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index cb51c12,3531737..00cf087
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -20,6 -4,9 +20,7 @@@ Merged from 2.0
   * Fix accounting in FileCacheService to allow re-using RAR (CASSANDRA-6838)
   * Fix static counter columns (CASSANDRA-6827)
   * Restore expiring->deleted (cell) compaction optimization (CASSANDRA-6844)
+  * Fix CompactionManager.needsCleanup (CASSANDRA-6845)
 -
 -2.0.6
   * Avoid race-prone second "scrub" of system keyspace (CASSANDRA-6797)
   * Pool CqlRecordWriter clients by inetaddress rather than Range 
     (CASSANDRA-6665)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/019e3386/src/java/org/apache/cassandra/db/compaction/CompactionManager.java
----------------------------------------------------------------------


Mime
View raw message