Merge branch 'cassandra-2.0' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f5b3515e Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f5b3515e Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f5b3515e Branch: refs/heads/trunk Commit: f5b3515eec09a4609200dcfdaab8965665e57bdb Parents: 5cf381f babc2de Author: Aleksey Yeschenko <alek...@apache.org> Authored: Wed Feb 12 19:41:24 2014 +0300 Committer: Aleksey Yeschenko <alek...@apache.org> Committed: Wed Feb 12 19:41:24 2014 +0300 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../cassandra/service/MigrationManager.java | 18 ++++++++---------- 2 files changed, 9 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/f5b3515e/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 3831b38,a4dc8fd..a45df89 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -49,8 -17,8 +49,9 @@@ Merged from 1.2 * Fix mean cells and mean row size per sstable calculations (CASSANDRA-6667) * Compact hints after partial replay to clean out tombstones (CASSANDRA-6666) * Log USING TTL/TIMESTAMP in a counter update warning (CASSANDRA-6649) + * Don't exchange schema between nodes with different versions (CASSANDRA-6695) + 2.0.5 * Reduce garbage generated by bloom filter lookups (CASSANDRA-6609) * Add ks.cf names to tombstone logging (CASSANDRA-6597) http://git-wip-us.apache.org/repos/asf/cassandra/blob/f5b3515e/src/java/org/apache/cassandra/service/MigrationManager.java ----------------------------------------------------------------------
