Merge branch 'cassandra-3.3' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/07269e9b Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/07269e9b Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/07269e9b Branch: refs/heads/trunk Commit: 07269e9bcd5d2a83aa7933a715304d62177d9f07 Parents: 9e74891 fd08e75 Author: Marcus Eriksson <[email protected]> Authored: Thu Jan 21 09:12:16 2016 +0100 Committer: Marcus Eriksson <[email protected]> Committed: Thu Jan 21 09:12:16 2016 +0100 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../org/apache/cassandra/service/ActiveRepairService.java | 9 ++++----- 2 files changed, 5 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/07269e9b/CHANGES.txt ----------------------------------------------------------------------
