Updated Branches: refs/heads/trunk 15d14cc62 -> 6a15bb37b
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/6a15bb37 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6a15bb37 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6a15bb37 Branch: refs/heads/trunk Commit: 6a15bb37bd80df06ea219d02ab285025cfae4608 Parents: 15d14cc cc8d160 Author: Dave Brosius <dbros...@apache.org> Authored: Thu Jan 24 18:46:55 2013 -0500 Committer: Dave Brosius <dbros...@apache.org> Committed: Thu Jan 24 18:46:55 2013 -0500 ---------------------------------------------------------------------- .../db/compaction/AbstractCompactionStrategy.java | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) ----------------------------------------------------------------------
