Merge branch 'cassandra-3.0' into cassandra-3.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/29178b2f Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/29178b2f Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/29178b2f Branch: refs/heads/trunk Commit: 29178b2fe4881a46708bd03017fff050ac6af287 Parents: c29279c e8091d5 Author: Robert Stupp <[email protected]> Authored: Fri Nov 27 09:30:57 2015 +0100 Committer: Robert Stupp <[email protected]> Committed: Fri Nov 27 09:30:57 2015 +0100 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/db/DeletionTime.java | 3 +-- 2 files changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/29178b2f/CHANGES.txt ----------------------------------------------------------------------
