Merge branch 'cassandra-3.9' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/582f9dc0 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/582f9dc0 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/582f9dc0 Branch: refs/heads/trunk Commit: 582f9dc086ef1d537a00968cd090d3fbedb161fd Parents: e0a6b9c c7547e0 Author: Stefania Alborghetti <[email protected]> Authored: Wed Jun 29 14:06:23 2016 +0800 Committer: Stefania Alborghetti <[email protected]> Committed: Wed Jun 29 14:06:23 2016 +0800 ---------------------------------------------------------------------- CHANGES.txt | 2 ++ src/java/org/apache/cassandra/utils/memory/MemoryUtil.java | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/582f9dc0/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index ae6460e,463cf78..81740ab --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,7 -1,6 +1,9 @@@ +3.10 + * Remove pre-startup check for open JMX port (CASSANDRA-12074) + 3.9 + Merged from 2.2: + * MemoryUtil.getShort() should return an unsigned short also for architectures not supporting unaligned memory accesses (CASSANDRA-11973) Merged from 2.1: * Avoid stalling paxos when the paxos state expires (CASSANDRA-12043) * Remove finished incoming streaming connections from MessagingService (CASSANDRA-11854)
