Merge branch 'cassandra-1.2.0' into cassandra-1.2
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/cf3cde3d Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/cf3cde3d Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/cf3cde3d Branch: refs/heads/trunk Commit: cf3cde3d99ba9250d6f606cc52e15f50d3c7ddf7 Parents: b49ca58 44545d3 Author: Brandon Williams <[email protected]> Authored: Fri Dec 7 15:43:55 2012 -0600 Committer: Brandon Williams <[email protected]> Committed: Fri Dec 7 15:43:55 2012 -0600 ---------------------------------------------------------------------- CHANGES.txt | 2 +- .../db/columniterator/SSTableNamesIterator.java | 2 +- .../apache/cassandra/io/sstable/IndexHelper.java | 4 + .../apache/cassandra/service/MigrationManager.java | 56 +++++++++------ .../apache/cassandra/service/StorageService.java | 5 +- .../cassandra/io/sstable/IndexHelperTest.java | 33 ++++++--- 6 files changed, 66 insertions(+), 36 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/cf3cde3d/CHANGES.txt ----------------------------------------------------------------------
