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/36727319 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/36727319 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/36727319 Branch: refs/heads/trunk Commit: 367273190811c9666d72467a616479e640f8be5e Parents: 0836f3c c1332ef Author: Sylvain Lebresne <[email protected]> Authored: Wed Mar 20 09:41:17 2013 +0100 Committer: Sylvain Lebresne <[email protected]> Committed: Wed Mar 20 09:41:17 2013 +0100 ---------------------------------------------------------------------- CHANGES.txt | 2 ++ .../apache/cassandra/service/MigrationManager.java | 2 +- 2 files changed, 3 insertions(+), 1 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/36727319/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index a59af6a,174cca4..681fb44 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -21,8 -1,9 +21,10 @@@ 1.2.4 * Fix mixing prepared statements between keyspaces (CASSANDRA-5352) * Fix consistency level during bootstrap - strike 3 (CASSANDRA-5354) + * Fix transposed arguments in AlreadyExistsException (CASSANDRA-5362) + + 1.2.3 * add check for sstable overlap within a level on startup (CASSANDRA-5327) * replace ipv6 colons in jmx object names (CASSANDRA-5298, 5328) http://git-wip-us.apache.org/repos/asf/cassandra/blob/36727319/src/java/org/apache/cassandra/service/MigrationManager.java ----------------------------------------------------------------------
