You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@cassandra.apache.org by jb...@apache.org on 2012/12/04 21:39:40 UTC

[1/10] git commit: Merge branch 'cassandra-1.2' into trunk

Updated Branches:
  refs/heads/cassandra-1.1 32135741b -> 2e271233f
  refs/heads/cassandra-1.2 b475602be -> b58e1b853
  refs/heads/cassandra-1.2.0 91f36f6dc -> 66026510d
  refs/heads/trunk 55aefb007 -> b57d25020


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/b57d2502
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b57d2502
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b57d2502

Branch: refs/heads/trunk
Commit: b57d250206cc70f8e03e3f7729c2ae31a5ab2e08
Parents: 55aefb0 b58e1b8
Author: Jonathan Ellis <jb...@apache.org>
Authored: Tue Dec 4 14:39:35 2012 -0600
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Tue Dec 4 14:39:35 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/b57d2502/src/java/org/apache/cassandra/service/MigrationManager.java
----------------------------------------------------------------------