cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From slebre...@apache.org
Subject [12/17] git commit: Merge branch 'cassandra-1.1.0' into cassandra-1.1
Date Tue, 13 Mar 2012 13:16:58 GMT
Merge branch 'cassandra-1.1.0' into cassandra-1.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/62b0699c
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/62b0699c
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/62b0699c

Branch: refs/heads/trunk
Commit: 62b0699c8d362ebdb96ddb487428a6fe93bb8170
Parents: 269ed63 d78db44
Author: Sylvain Lebresne <sylvain@datastax.com>
Authored: Wed Mar 7 18:55:58 2012 +0100
Committer: Sylvain Lebresne <sylvain@datastax.com>
Committed: Wed Mar 7 18:55:58 2012 +0100

----------------------------------------------------------------------
 CHANGES.txt                                        |    5 +-
 src/java/org/apache/cassandra/db/ColumnFamily.java |   20 +++++++
 .../org/apache/cassandra/db/ColumnFamilyStore.java |   16 ++++--
 src/java/org/apache/cassandra/db/DataTracker.java  |   15 +++---
 .../cassandra/db/compaction/CompactionManager.java |    8 ++-
 .../cassandra/db/compaction/CompactionTask.java    |   16 ++++--
 .../db/compaction/LeveledCompactionStrategy.java   |   13 ++++-
 .../cassandra/db/compaction/LeveledManifest.java   |   41 ++++++++++-----
 .../cassandra/db/compaction/OperationType.java     |    1 +
 .../org/apache/cassandra/io/util/FileUtils.java    |   17 ------
 .../SSTableListChangedNotification.java            |   11 +++-
 .../cassandra/db/compaction/CompactionsTest.java   |    3 +-
 12 files changed, 108 insertions(+), 58 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/62b0699c/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 898e140,d7a595b..5ed5299
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -30,8 -25,11 +30,6 @@@ Merged from 1.0
   * (cqlsh) ignore missing CfDef opts (CASSANDRA-3933)
   * (cqlsh) look for cqlshlib relative to realpath (CASSANDRA-3767)
   * Fix short read protection (CASSANDRA-3934)
-- * don't change manifest level for cleanup, scrub, and upgradesstables
--   operations under LeveledCompactionStrategy (CASSANDRA-3989)
 -=======
 -1.0.9
 ->>>>>>> cassandra-1.0
   * always compact away deleted hints immediately after handoff (CASSANDRA-3955)
   * delete hints from dropped ColumnFamilies on handoff instead of
     erroring out (CASSANDRA-3975)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/62b0699c/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
----------------------------------------------------------------------

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

http://git-wip-us.apache.org/repos/asf/cassandra/blob/62b0699c/src/java/org/apache/cassandra/db/compaction/LeveledManifest.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/62b0699c/test/unit/org/apache/cassandra/db/compaction/CompactionsTest.java
----------------------------------------------------------------------


Mime
View raw message