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