Updated Branches: refs/heads/trunk b88867ffa -> cfbcd98e0
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/cfbcd98e Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/cfbcd98e Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/cfbcd98e Branch: refs/heads/trunk Commit: cfbcd98e0ab08317780b7c2598f99735fe0be191 Parents: b88867f 7cb8cf1 Author: Aleksey Yeschenko <[email protected]> Authored: Thu Mar 14 00:03:46 2013 +0300 Committer: Aleksey Yeschenko <[email protected]> Committed: Thu Mar 14 00:03:46 2013 +0300 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../apache/cassandra/service/MigrationManager.java | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/cfbcd98e/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/cfbcd98e/src/java/org/apache/cassandra/service/MigrationManager.java ----------------------------------------------------------------------
