Merge branch 'cassandra-3.9' into trunk * cassandra-3.9: NullPointerExpception when reading/compacting table
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/a6f5009f Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a6f5009f Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a6f5009f Branch: refs/heads/trunk Commit: a6f5009f658a6e5ce35de2b5f803a0b81c076378 Parents: a41fb50 43d726b Author: Sylvain Lebresne <sylv...@datastax.com> Authored: Wed Jul 20 14:29:28 2016 +0200 Committer: Sylvain Lebresne <sylv...@datastax.com> Committed: Wed Jul 20 14:29:28 2016 +0200 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../db/partitions/AbstractBTreePartition.java | 2 +- .../cassandra/db/partitions/PurgeFunction.java | 15 ++++++++----- .../cassandra/db/rows/BaseRowIterator.java | 2 +- src/java/org/apache/cassandra/db/rows/Row.java | 13 +++++++++--- .../apache/cassandra/db/transform/BaseRows.java | 2 +- .../apache/cassandra/db/transform/Filter.java | 12 +++++++---- .../validation/entities/StaticColumnsTest.java | 22 ++++++++++++++++++++ 8 files changed, 54 insertions(+), 15 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/a6f5009f/CHANGES.txt ----------------------------------------------------------------------
