Updated Branches: refs/heads/cassandra-1.2 0888a0cb5 -> 26a9ab1f0 refs/heads/trunk 87ae145bb -> f0acccd50
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/f0acccd5 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f0acccd5 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f0acccd5 Branch: refs/heads/trunk Commit: f0acccd50e8f3ca5350f1d758a974ce7f8db84ab Parents: 87ae145 26a9ab1 Author: Jonathan Ellis <[email protected]> Authored: Thu Dec 27 10:43:08 2012 -0500 Committer: Jonathan Ellis <[email protected]> Committed: Thu Dec 27 10:43:08 2012 -0500 ---------------------------------------------------------------------- .../cassandra/db/compaction/CompactionTask.java | 23 +++++++++++--- .../apache/cassandra/io/sstable/Descriptor.java | 2 +- 2 files changed, 19 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/f0acccd5/src/java/org/apache/cassandra/db/compaction/CompactionTask.java ----------------------------------------------------------------------
