Merge branch 'cassandra-3.0' into cassandra-3.9 * cassandra-3.0: 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/3dceaaba Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3dceaaba Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3dceaaba Branch: refs/heads/cassandra-3.9 Commit: 3dceaaba80b9f7cd364424558f77c1128907b632 Parents: 2df345a 4f14bc5 Author: Sylvain Lebresne <sylv...@datastax.com> Authored: Thu Jun 30 16:53:48 2016 +0200 Committer: Sylvain Lebresne <sylv...@datastax.com> Committed: Thu Jun 30 16:53:48 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/3dceaaba/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index ed884a9,f12d704..475365f --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,5 -1,5 +1,6 @@@ -3.0.9 +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) http://git-wip-us.apache.org/repos/asf/cassandra/blob/3dceaaba/src/java/org/apache/cassandra/db/rows/RowIterators.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/3dceaaba/src/java/org/apache/cassandra/db/rows/UnfilteredRowIterators.java ----------------------------------------------------------------------