Updated Branches: refs/heads/trunk 0ba454168 -> 76736edc6
Merge branch 'cassandra-1.1' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/76736edc Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/76736edc Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/76736edc Branch: refs/heads/trunk Commit: 76736edc69d6961f8fa9d3527ad78ee1830a05d8 Parents: 0ba4541 270850d Author: Jonathan Ellis <jbel...@apache.org> Authored: Sun Feb 5 17:57:50 2012 -0600 Committer: Jonathan Ellis <jbel...@apache.org> Committed: Sun Feb 5 17:57:50 2012 -0600 ---------------------------------------------------------------------- CHANGES.txt | 2 +- .../apache/cassandra/service/MigrationManager.java | 9 +++++---- 2 files changed, 6 insertions(+), 5 deletions(-) ----------------------------------------------------------------------
