Updated Branches: refs/heads/cassandra-1.1 19c3bd3b3 -> f34bd79b9 refs/heads/trunk ed6d24e59 -> 5e425cb15
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/5e425cb1 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5e425cb1 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5e425cb1 Branch: refs/heads/trunk Commit: 5e425cb15d91502c137545f5dec567595f04bdd8 Parents: ed6d24e f34bd79 Author: Jonathan Ellis <[email protected]> Authored: Tue Oct 9 16:46:05 2012 -0500 Committer: Jonathan Ellis <[email protected]> Committed: Tue Oct 9 16:46:05 2012 -0500 ---------------------------------------------------------------------- .../cassandra/db/compaction/LeveledManifest.java | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/5e425cb1/src/java/org/apache/cassandra/db/compaction/LeveledManifest.java ----------------------------------------------------------------------
