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/32b842b1 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/32b842b1 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/32b842b1 Branch: refs/heads/trunk Commit: 32b842b13922c8462b8ebec01c34cf9ca0ca3e11 Parents: 12948f6 b537567 Author: Jonathan Ellis <jbel...@apache.org> Authored: Thu Dec 6 16:15:23 2012 -0600 Committer: Jonathan Ellis <jbel...@apache.org> Committed: Thu Dec 6 16:15:23 2012 -0600 ---------------------------------------------------------------------- CHANGES.txt | 2 + .../apache/cassandra/service/MigrationManager.java | 43 +++++++++++---- 2 files changed, 34 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/32b842b1/CHANGES.txt ----------------------------------------------------------------------
