Merge branch 'cassandra-3.7' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/9c8ee4c7 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9c8ee4c7 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/9c8ee4c7 Branch: refs/heads/trunk Commit: 9c8ee4c73f4e4e8d5b7693d34a0d6d6397418e90 Parents: 87def2e f39a352 Author: Yuki Morishita <[email protected]> Authored: Wed May 25 19:35:27 2016 -0500 Committer: Yuki Morishita <[email protected]> Committed: Wed May 25 19:35:27 2016 -0500 ---------------------------------------------------------------------- CHANGES.txt | 1 + conf/cassandra.yaml | 10 ++++++---- src/java/org/apache/cassandra/config/Config.java | 2 +- .../cassandra/streaming/StreamSession.java | 19 +++++++++++++++---- 4 files changed, 23 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/9c8ee4c7/CHANGES.txt ----------------------------------------------------------------------
