Merge branch 'cassandra-2.2' into cassandra-3.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/362e1320 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/362e1320 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/362e1320 Branch: refs/heads/trunk Commit: 362e132069dcda15b2edfc872ece552645cfda84 Parents: 1cff5fa 38ed061 Author: Stefania Alborghetti <stefania.alborghe...@datastax.com> Authored: Wed Jun 29 14:04:45 2016 +0800 Committer: Stefania Alborghetti <stefania.alborghe...@datastax.com> Committed: Wed Jun 29 14:04:45 2016 +0800 ---------------------------------------------------------------------- CHANGES.txt | 4 ++++ src/java/org/apache/cassandra/utils/memory/MemoryUtil.java | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/362e1320/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index aaeafd6,48bd5aa..ae37d2c --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,11 -1,7 +1,15 @@@ -2.2.8 ++3.0.9 ++Merged from 2.2: + * MemoryUtil.getShort() should return an unsigned short also for architectures not supporting unaligned memory accesses (CASSANDRA-11973) + -2.2.7 +3.0.8 + * Fix potential race in schema during new table creation (CASSANDRA-12083) + * cqlsh: fix error handling in rare COPY FROM failure scenario (CASSANDRA-12070) + * Disable autocompaction during drain (CASSANDRA-11878) + * Add a metrics timer to MemtablePool and use it to track time spent blocked on memory in MemtableAllocator (CASSANDRA-11327) + * Fix upgrading schema with super columns with non-text subcomparators (CASSANDRA-12023) + * Add TimeWindowCompactionStrategy (CASSANDRA-9666) +Merged from 2.2: * Allow nodetool info to run with readonly JMX access (CASSANDRA-11755) * Validate bloom_filter_fp_chance against lowest supported value when the table is created (CASSANDRA-11920) http://git-wip-us.apache.org/repos/asf/cassandra/blob/362e1320/src/java/org/apache/cassandra/utils/memory/MemoryUtil.java ----------------------------------------------------------------------
