You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by jb...@apache.org on 2012/03/02 19:32:36 UTC
[1/8] git commit: Merge branch 'cassandra-1.1' into trunk
Updated Branches:
refs/heads/cassandra-1.0 bc05b5960 -> 53fb52ac7
refs/heads/trunk a3c07ee41 -> 5f60deeef
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/5f60deee
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5f60deee
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5f60deee
Branch: refs/heads/trunk
Commit: 5f60deeef191b7394bd0813baddacb5cf3cef15c
Parents: 5613f8f 4ae62e6
Author: Jonathan Ellis <jb...@apache.org>
Authored: Fri Mar 2 12:31:36 2012 -0600
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Fri Mar 2 12:31:36 2012 -0600
----------------------------------------------------------------------
CHANGES.txt | 2 ++
.../cassandra/db/compaction/LeveledManifest.java | 10 ++++++++--
2 files changed, 10 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5f60deee/src/java/org/apache/cassandra/db/compaction/LeveledManifest.java
----------------------------------------------------------------------