Merge branch 'cassandra-3.X' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/87b1bb87 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/87b1bb87 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/87b1bb87 Branch: refs/heads/trunk Commit: 87b1bb87a42bc64f5fcb3eef8a4bdba766187545 Parents: c607d76 917d13f Author: T Jake Luciani <[email protected]> Authored: Tue Jan 3 13:04:52 2017 -0500 Committer: T Jake Luciani <[email protected]> Committed: Tue Jan 3 13:04:52 2017 -0500 ---------------------------------------------------------------------- CHANGES.txt | 3 +++ .../org/apache/cassandra/locator/DynamicEndpointSnitch.java | 4 +--- .../apache/cassandra/locator/DynamicEndpointSnitchTest.java | 8 ++++++++ 3 files changed, 12 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/87b1bb87/CHANGES.txt ----------------------------------------------------------------------
