Merge branch 'cassandra-1.2' into cassandra-2.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b5321d50 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b5321d50 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b5321d50 Branch: refs/heads/cassandra-2.0 Commit: b5321d50bba3733e9dc359714eb658c191ca2975 Parents: 16f99c5 c562700 Author: Brandon Williams <brandonwilli...@apache.org> Authored: Mon Feb 10 09:37:43 2014 -0600 Committer: Brandon Williams <brandonwilli...@apache.org> Committed: Mon Feb 10 09:37:43 2014 -0600 ---------------------------------------------------------------------- src/java/org/apache/cassandra/service/MigrationManager.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/b5321d50/src/java/org/apache/cassandra/service/MigrationManager.java ----------------------------------------------------------------------
