Merge branch 'cassandra-3.11' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/3048608c Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3048608c Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3048608c Branch: refs/heads/trunk Commit: 3048608c6099fd5c3bcc9bd72d3265307283bc41 Parents: 18c6ed2 a10b807 Author: Stefan Podkowinski <s.podkowin...@gmail.com> Authored: Thu Mar 23 20:56:22 2017 +0100 Committer: Stefan Podkowinski <s.podkowin...@gmail.com> Committed: Thu Mar 23 20:57:10 2017 +0100 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../src/org/apache/cassandra/stress/settings/SettingsTransport.java | 1 + 2 files changed, 2 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/3048608c/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/3048608c/tools/stress/src/org/apache/cassandra/stress/settings/SettingsTransport.java ----------------------------------------------------------------------
