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/afd63687 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/afd63687 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/afd63687 Branch: refs/heads/trunk Commit: afd6368745d6ac4bc43e70cc1c4b47ce59f754e7 Parents: aac421a c5f225b Author: Brandon Williams <brandonwilli...@apache.org> Authored: Tue Feb 11 17:14:01 2014 -0600 Committer: Brandon Williams <brandonwilli...@apache.org> Committed: Tue Feb 11 17:14:01 2014 -0600 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../org/apache/cassandra/service/StorageService.java | 12 ++++++++++++ 2 files changed, 13 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/afd63687/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 8e7e249,fd640cd..1025510 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -42,7 -9,10 +42,8 @@@ * Correctly handle null with IF conditions and TTL (CASSANDRA-6623) * Account for range/row tombstones in tombstone drop time histogram (CASSANDRA-6522) - * Stop CommitLogSegment.close() from calling sync() (CASSANDRA-6652) - * Make commitlog failure handling configurable (CASSANDRA-6364) Merged from 1.2: + * Fix broken streams when replacing with same IP (CASSANDRA-6622) * Fix upgradesstables NPE for non-CF-based indexes (CASSANDRA-6645) * Fix partition and range deletes not triggering flush (CASSANDRA-6655) * Fix mean cells and mean row size per sstable calculations (CASSANDRA-6667) http://git-wip-us.apache.org/repos/asf/cassandra/blob/afd63687/src/java/org/apache/cassandra/service/StorageService.java ----------------------------------------------------------------------
