Merge branch 'cassandra-3.5' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/494386de Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/494386de Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/494386de Branch: refs/heads/trunk Commit: 494386de8519e48c5f0d726ebef6b320cd86675a Parents: 0a016ea f6c5d72 Author: Sam Tunnicliffe <[email protected]> Authored: Thu Mar 24 11:43:45 2016 +0000 Committer: Sam Tunnicliffe <[email protected]> Committed: Thu Mar 24 11:43:45 2016 +0000 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../utils/RMIServerSocketFactoryImpl.java | 11 ++++++--- .../service/RMIServerSocketFactoryImplTest.java | 24 ++++++++++++++++++++ 3 files changed, 33 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/494386de/CHANGES.txt ----------------------------------------------------------------------
