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/84393454 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/84393454 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/84393454 Branch: refs/heads/trunk Commit: 8439345487cff581e3c37110bfcefeaa542a72c3 Parents: 1e1302e 14327e4 Author: Tyler Hobbs <[email protected]> Authored: Wed Mar 25 10:41:25 2015 -0500 Committer: Tyler Hobbs <[email protected]> Committed: Wed Mar 25 10:41:25 2015 -0500 ---------------------------------------------------------------------- CHANGES.txt | 2 ++ src/java/org/apache/cassandra/service/MigrationTask.java | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/84393454/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/84393454/src/java/org/apache/cassandra/service/MigrationTask.java ----------------------------------------------------------------------
