Updated Branches: refs/heads/trunk 0848844e2 -> 2ed977a3c
Merge branch 'cassandra-1.1' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/2ed977a3 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2ed977a3 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2ed977a3 Branch: refs/heads/trunk Commit: 2ed977a3cfa90756eeee41264a2cbcdabced0073 Parents: 0848844 2236b15 Author: Dave Brosius <[email protected]> Authored: Mon May 21 19:45:43 2012 -0400 Committer: Dave Brosius <[email protected]> Committed: Mon May 21 19:45:43 2012 -0400 ---------------------------------------------------------------------- .../cassandra/db/compaction/LeveledManifest.java | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/2ed977a3/src/java/org/apache/cassandra/db/compaction/LeveledManifest.java ----------------------------------------------------------------------
