Repository: cassandra Updated Branches: refs/heads/cassandra-3.0 699de73ab -> 517b652f5 refs/heads/trunk 820683932 -> beaa2b1b9
Fix CHANGES.txt Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/699de73a Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/699de73a Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/699de73a Branch: refs/heads/trunk Commit: 699de73abb750603cc1c19b62eb60946933900a6 Parents: ade38b2 Author: Nate McCall <zznat...@gmail.com> Authored: Tue Sep 20 15:05:22 2016 +1200 Committer: Nate McCall <zznat...@gmail.com> Committed: Tue Sep 20 15:05:22 2016 +1200 ---------------------------------------------------------------------- CHANGES.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/699de73a/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index 6759897..791f99c 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,6 +1,8 @@ 3.0.10 * Extend ColumnIdentifier.internedInstances key to include the type that generated the byte buffer (CASSANDRA-12516) * Backport CASSANDRA-10756 (race condition in NativeTransportService shutdown) (CASSANDRA-12472) +Merged from 2.1: + * Add system property to set the max number of native transport requests in queue (CASSANDRA-11363) 3.0.9 @@ -81,7 +83,6 @@ Merged from 2.2: * Improve streaming synchronization and fault tolerance (CASSANDRA-11414) * MemoryUtil.getShort() should return an unsigned short also for architectures not supporting unaligned memory accesses (CASSANDRA-11973) Merged from 2.1: - * Add system property to set the max number of native transport requests in queue (CASSANDRA-11363) * Fix queries with empty ByteBuffer values in clustering column restrictions (CASSANDRA-12127) * Disable passing control to post-flush after flush failure to prevent data loss (CASSANDRA-11828) * Allow STCS-in-L0 compactions to reduce scope with LCS (CASSANDRA-12040)