Merge branch 'cassandra-3.9' into trunk * cassandra-3.9: Exclude static columns from digest on empty static row
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c7f4600b Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c7f4600b Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c7f4600b Branch: refs/heads/trunk Commit: c7f4600be3cb8e816158674599287b7279fb8ff0 Parents: db174f3 3dceaab Author: Sylvain Lebresne <sylv...@datastax.com> Authored: Thu Jun 30 16:54:00 2016 +0200 Committer: Sylvain Lebresne <sylv...@datastax.com> Committed: Thu Jun 30 16:54:00 2016 +0200 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../org/apache/cassandra/db/PartitionColumns.java | 7 ------- .../cassandra/db/partitions/PartitionIterators.java | 11 ----------- .../org/apache/cassandra/db/rows/RowIterators.java | 9 ++++++--- .../cassandra/db/rows/UnfilteredRowIterators.java | 14 +++++++++++++- 5 files changed, 20 insertions(+), 22 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/c7f4600b/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 6068b14,475365f..44b6699 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,8 -1,6 +1,9 @@@ +3.10 + * Remove pre-startup check for open JMX port (CASSANDRA-12074) + 3.9 Merged from 3.0: + * Avoid digest mismatch with empty but static rows (CASSANDRA-12090) * Fix EOF exception when altering column type (CASSANDRA-11820) Merged from 2.2: * MemoryUtil.getShort() should return an unsigned short also for architectures not supporting unaligned memory accesses (CASSANDRA-11973)
