Updated Branches: refs/heads/cassandra-1.2 32b842b13 -> 8c1683345 refs/heads/cassandra-1.2.0 b537567b3 -> b4f369301 refs/heads/trunk 6c3e437ab -> ef379f280
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/ef379f28 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ef379f28 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ef379f28 Branch: refs/heads/trunk Commit: ef379f280a4c181b1eb45717d970f6b30026cbec Parents: 6c3e437 8c16833 Author: Jonathan Ellis <jbel...@apache.org> Authored: Thu Dec 6 16:22:00 2012 -0600 Committer: Jonathan Ellis <jbel...@apache.org> Committed: Thu Dec 6 16:22:00 2012 -0600 ---------------------------------------------------------------------- .../apache/cassandra/service/MigrationManager.java | 17 ++++---------- 1 files changed, 5 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/ef379f28/src/java/org/apache/cassandra/service/MigrationManager.java ----------------------------------------------------------------------
