Merge branch 'cassandra-1.2.0' into cassandra-1.2
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b58e1b85 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b58e1b85 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b58e1b85 Branch: refs/heads/trunk Commit: b58e1b85392a9bad36f3fcaaf70e9204b4db6d4d Parents: b475602 6602651 Author: Jonathan Ellis <[email protected]> Authored: Tue Dec 4 14:39:26 2012 -0600 Committer: Jonathan Ellis <[email protected]> Committed: Tue Dec 4 14:39:26 2012 -0600 ---------------------------------------------------------------------- .../apache/cassandra/service/MigrationManager.java | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) ----------------------------------------------------------------------
