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/f5e6f4ed Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f5e6f4ed Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f5e6f4ed Branch: refs/heads/trunk Commit: f5e6f4edd6dccf0061847d6fc17ad01eccae2756 Parents: 0401f57 21a7a1c Author: Robert Stupp <sn...@snazy.de> Authored: Fri Nov 27 12:59:01 2015 +0100 Committer: Robert Stupp <sn...@snazy.de> Committed: Fri Nov 27 12:59:01 2015 +0100 ---------------------------------------------------------------------- CHANGES.txt | 1 + debian/init | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/f5e6f4ed/CHANGES.txt ----------------------------------------------------------------------