Updated Branches: refs/heads/cassandra-1.1 5abeecc8b -> 8d55474fe refs/heads/cassandra-1.2 12948f652 -> 32b842b13 refs/heads/cassandra-1.2.0 7322f8238 -> b537567b3 refs/heads/trunk fa9c54ef6 -> 6c3e437ab
Merge branch 'cassandra-1.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/6c3e437a Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6c3e437a Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6c3e437a Branch: refs/heads/trunk Commit: 6c3e437abdc874f405093724a0589090d35ca3ad Parents: fa9c54e 32b842b Author: Jonathan Ellis <jbel...@apache.org> Authored: Thu Dec 6 16:15:33 2012 -0600 Committer: Jonathan Ellis <jbel...@apache.org> Committed: Thu Dec 6 16:15:33 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/6c3e437a/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/6c3e437a/src/java/org/apache/cassandra/service/MigrationManager.java ----------------------------------------------------------------------
