Merge branch 'cassandra-3.0' into cassandra-3.5
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b80a31d7 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b80a31d7 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b80a31d7 Branch: refs/heads/cassandra-3.5 Commit: b80a31d7e0e3ea7bdb6cd5eb9de8d33a38e04430 Parents: b984ea3 067c8df Author: T Jake Luciani <j...@apache.org> Authored: Thu Mar 31 10:18:02 2016 -0400 Committer: T Jake Luciani <j...@apache.org> Committed: Thu Mar 31 10:18:02 2016 -0400 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../stress/settings/SettingsTransport.java | 18 +++++++++++++++++- 2 files changed, 18 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/b80a31d7/CHANGES.txt ----------------------------------------------------------------------
