Updated Branches: refs/heads/cassandra-1.1 117d91ae2 -> ef8620f88 refs/heads/trunk dc97a8ff5 -> ae6a43c22
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/ae6a43c2 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ae6a43c2 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ae6a43c2 Branch: refs/heads/trunk Commit: ae6a43c227d4774df75cfd43662872d94f738b2c Parents: dc97a8f ef8620f Author: Jonathan Ellis <[email protected]> Authored: Fri Sep 21 11:32:31 2012 -0500 Committer: Jonathan Ellis <[email protected]> Committed: Fri Sep 21 11:32:31 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/ae6a43c2/src/java/org/apache/cassandra/db/compaction/LeveledManifest.java ----------------------------------------------------------------------
