Merge branch 'cassandra-2.0' into cassandra-2.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ffc8dae6 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ffc8dae6 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ffc8dae6 Branch: refs/heads/trunk Commit: ffc8dae6d21b4766f15135bac7dccdcf99b630f0 Parents: db3935e a421551 Author: Brandon Williams <brandonwilli...@apache.org> Authored: Tue Apr 8 14:30:29 2014 -0500 Committer: Brandon Williams <brandonwilli...@apache.org> Committed: Tue Apr 8 14:30:29 2014 -0500 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../org/apache/cassandra/service/MigrationManager.java | 12 +++++++++++- .../org/apache/cassandra/service/StorageService.java | 2 ++ 3 files changed, 14 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/ffc8dae6/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/ffc8dae6/src/java/org/apache/cassandra/service/MigrationManager.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/ffc8dae6/src/java/org/apache/cassandra/service/StorageService.java ----------------------------------------------------------------------
