Merge branch 'cassandra-1.1.0' of https://git-wip-us.apache.org/repos/asf/cassandra into cassandra-1.1.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/08e4fb35 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/08e4fb35 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/08e4fb35 Branch: refs/heads/trunk Commit: 08e4fb35e89cc9d320c230ac87ac5338da674fbc Parents: 2b35644 7d3416c Author: Brandon Williams <[email protected]> Authored: Mon Mar 5 17:44:16 2012 -0600 Committer: Brandon Williams <[email protected]> Committed: Mon Mar 5 17:44:16 2012 -0600 ---------------------------------------------------------------------- CHANGES.txt | 3 +++ .../cassandra/db/compaction/LeveledManifest.java | 10 ++++++++-- .../cassandra/hadoop/ColumnFamilyRecordReader.java | 13 +++++++------ .../apache/cassandra/service/StorageService.java | 10 ++++++++++ 4 files changed, 28 insertions(+), 8 deletions(-) ----------------------------------------------------------------------
