Merge branch 'cassandra-2.1' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e4a4aa21 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e4a4aa21 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e4a4aa21 Branch: refs/heads/trunk Commit: e4a4aa21f56fce41aa8dbe7931cdba0348f13410 Parents: b426963 fc868c5 Author: Aleksey Yeschenko <[email protected]> Authored: Mon Mar 9 20:08:42 2015 -0700 Committer: Aleksey Yeschenko <[email protected]> Committed: Mon Mar 9 20:08:42 2015 -0700 ---------------------------------------------------------------------- CHANGES.txt | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/e4a4aa21/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 34037f4,f5e1a1d..79e6178 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -220,7 -158,10 +220,11 @@@ Merged from 2.0 (CASSANDRA-8619) * Round up time deltas lower than 1ms in BulkLoader (CASSANDRA-8645) * Add batch remove iterator to ABSC (CASSANDRA-8414, 8666) + * Round up time deltas lower than 1ms in BulkLoader (CASSANDRA-8645) + * Fix isClientMode check in Keyspace (CASSANDRA-8687) + * 'nodetool info' prints exception against older node (CASSANDRA-8796) + * Ensure SSTableSimpleUnsortedWriter.close() terminates if + disk writer has crashed (CASSANDRA-8807) * Use more efficient slice size for querying internal secondary index tables (CASSANDRA-8550) * Fix potentially returning deleted rows with range tombstone (CASSANDRA-8558)
