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/6041d41c Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6041d41c Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6041d41c Branch: refs/heads/trunk Commit: 6041d41cd867a93d795a7c86f411b2159949073d Parents: 34f9c97 561293d Author: Aleksey Yeschenko <alek...@apache.org> Authored: Wed Jan 7 22:52:13 2015 +0300 Committer: Aleksey Yeschenko <alek...@apache.org> Committed: Wed Jan 7 22:52:13 2015 +0300 ---------------------------------------------------------------------- CHANGES.txt | 3 +-- .../org/apache/cassandra/service/MigrationManager.java | 2 +- .../org/apache/cassandra/service/MigrationTask.java | 12 ++++++++++-- 3 files changed, 12 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/6041d41c/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/6041d41c/src/java/org/apache/cassandra/service/MigrationManager.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/6041d41c/src/java/org/apache/cassandra/service/MigrationTask.java ----------------------------------------------------------------------
