Updated Branches: refs/heads/cassandra-1.2 b49ca58b2 -> cf3cde3d9 refs/heads/cassandra-1.2.0 f91001a08 -> 44545d380 refs/heads/trunk 5a7943da4 -> 40dad0aea
Merge branch 'cassandra-1.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/40dad0ae Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/40dad0ae Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/40dad0ae Branch: refs/heads/trunk Commit: 40dad0aea76b8abd29dd4bb8f5590de195a293e7 Parents: 5a7943d cf3cde3 Author: Brandon Williams <[email protected]> Authored: Fri Dec 7 15:44:06 2012 -0600 Committer: Brandon Williams <[email protected]> Committed: Fri Dec 7 15:44:06 2012 -0600 ---------------------------------------------------------------------- CHANGES.txt | 2 +- .../db/columniterator/SSTableNamesIterator.java | 2 +- .../io/compress/CompressionParameters.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 ++++++--- 7 files changed, 67 insertions(+), 37 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/40dad0ae/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/40dad0ae/src/java/org/apache/cassandra/service/MigrationManager.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/40dad0ae/src/java/org/apache/cassandra/service/StorageService.java ----------------------------------------------------------------------
