Merge branch 'cassandra-2.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/05a45757 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/05a45757 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/05a45757 Branch: refs/heads/trunk Commit: 05a457574ccdc2309231e27bf864e3f990bde21a Parents: cd74a6d ffc8dae Author: Brandon Williams <[email protected]> Authored: Tue Apr 8 14:30:43 2014 -0500 Committer: Brandon Williams <[email protected]> Committed: Tue Apr 8 14:30:43 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/05a45757/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/05a45757/src/java/org/apache/cassandra/service/StorageService.java ----------------------------------------------------------------------
