Updated Branches: refs/heads/trunk 224a6f456 -> 589fd5979
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/589fd597 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/589fd597 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/589fd597 Branch: refs/heads/trunk Commit: 589fd5979d647e00c157bcb9ab99257de3e44cc7 Parents: 224a6f4 71b2bd1 Author: Vijay Parthasarathy <[email protected]> Authored: Fri Mar 1 18:43:09 2013 -0800 Committer: Vijay Parthasarathy <[email protected]> Committed: Fri Mar 1 18:43:09 2013 -0800 ---------------------------------------------------------------------- .../cassandra/db/compaction/CompactionInfo.java | 12 +++++++----- 1 files changed, 7 insertions(+), 5 deletions(-) ----------------------------------------------------------------------
