Updated Branches: refs/heads/cassandra-1.1 4885bfccf -> 134e8c78d refs/heads/cassandra-1.2 a6d4f7a4e -> 9fdccd768 refs/heads/cassandra-1.2.0 d67816bee -> fb9ad748d refs/heads/trunk 77fb2080f -> 0febf44d5
Merge branch 'cassandra-1.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/0febf44d Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0febf44d Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/0febf44d Branch: refs/heads/trunk Commit: 0febf44d5246fd7dce6ac9e47193dd4a4bd18ad8 Parents: 77fb208 9fdccd7 Author: Jonathan Ellis <jbel...@apache.org> Authored: Tue Dec 18 14:54:28 2012 -0600 Committer: Jonathan Ellis <jbel...@apache.org> Committed: Tue Dec 18 14:54:28 2012 -0600 ---------------------------------------------------------------------- CHANGES.txt | 1 + conf/cassandra.yaml | 15 ++++++--------- .../db/compaction/AbstractCompactedRow.java | 3 ++- .../cassandra/db/compaction/CompactionTask.java | 3 +++ .../db/compaction/LazilyCompactedRow.java | 2 +- .../cassandra/db/compaction/PrecompactedRow.java | 2 ++ 6 files changed, 15 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/0febf44d/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/0febf44d/conf/cassandra.yaml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/0febf44d/src/java/org/apache/cassandra/db/compaction/CompactionTask.java ----------------------------------------------------------------------
