Merge branch 'cassandra-3.0' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/fba356d1 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/fba356d1 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/fba356d1 Branch: refs/heads/trunk Commit: fba356d1d726d9a4484ddecd5e09e349b0bae894 Parents: 9d8091f 3818d30 Author: Sam Tunnicliffe <[email protected]> Authored: Tue Sep 8 10:27:52 2015 +0100 Committer: Sam Tunnicliffe <[email protected]> Committed: Tue Sep 8 10:27:52 2015 +0100 ---------------------------------------------------------------------- CHANGES.txt | 2 ++ .../org/apache/cassandra/config/DatabaseDescriptor.java | 6 +++++- src/java/org/apache/cassandra/service/ClientState.java | 10 +++++++--- 3 files changed, 14 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/fba356d1/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/fba356d1/src/java/org/apache/cassandra/config/DatabaseDescriptor.java ----------------------------------------------------------------------
