Merge branch 'cassandra-3.0' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/2d2f55f2 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2d2f55f2 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2d2f55f2 Branch: refs/heads/trunk Commit: 2d2f55f2fb29b1a04a695754fd5753f62a4340a2 Parents: 3701170 a1b04c4 Author: Marcus Eriksson <marc...@apache.org> Authored: Thu Oct 1 16:43:31 2015 +0200 Committer: Marcus Eriksson <marc...@apache.org> Committed: Thu Oct 1 16:43:31 2015 +0200 ---------------------------------------------------------------------- .../cassandra/db/partitions/PurgingPartitionIterator.java | 8 ++++++++ 1 file changed, 8 insertions(+) ----------------------------------------------------------------------