Updated Branches: refs/heads/cassandra-1.2 b58e1b853 -> d25182f0d refs/heads/cassandra-1.2.0 66026510d -> 0d6990167 refs/heads/trunk b57d25020 -> bb229f25f
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/bb229f25 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/bb229f25 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/bb229f25 Branch: refs/heads/trunk Commit: bb229f25f4585993fa8aff6467c501486a6492b2 Parents: b57d250 d25182f Author: Jonathan Ellis <jbel...@apache.org> Authored: Tue Dec 4 14:49:22 2012 -0600 Committer: Jonathan Ellis <jbel...@apache.org> Committed: Tue Dec 4 14:49:22 2012 -0600 ---------------------------------------------------------------------- .../apache/cassandra/service/MigrationManager.java | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/bb229f25/src/java/org/apache/cassandra/service/MigrationManager.java ----------------------------------------------------------------------