Updated Branches: refs/heads/trunk 3c90be1d6 -> 720e01752
merge from 1.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/720e0175 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/720e0175 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/720e0175 Branch: refs/heads/trunk Commit: 720e017520f197e876a2b850e10340d9ef2cf748 Parents: 3c90be1 a6c567e Author: Pavel Yaskevich <xe...@apache.org> Authored: Tue Jul 10 20:17:29 2012 +0300 Committer: Pavel Yaskevich <xe...@apache.org> Committed: Tue Jul 10 20:17:29 2012 +0300 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../apache/cassandra/service/MigrationManager.java | 12 ++++++------ 2 files changed, 7 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/720e0175/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/720e0175/src/java/org/apache/cassandra/service/MigrationManager.java ----------------------------------------------------------------------