Merge branch 'cassandra-3.1' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/1c5238c1 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1c5238c1 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1c5238c1 Branch: refs/heads/trunk Commit: 1c5238c1f05264637f7e0d93309e539e1e69424f Parents: b3ff132 29178b2 Author: Robert Stupp <[email protected]> Authored: Fri Nov 27 09:31:03 2015 +0100 Committer: Robert Stupp <[email protected]> Committed: Fri Nov 27 09:31:03 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/1c5238c1/CHANGES.txt ----------------------------------------------------------------------
