Merge branch 'cassandra-3.0' into cassandra-3.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/d404362a Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d404362a Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d404362a Branch: refs/heads/trunk Commit: d404362adcca5bf62ab9c4bf24b0bd36eb13ab1c Parents: 421c41d ed424bd Author: Joshua McKenzie <jmcken...@apache.org> Authored: Fri Nov 13 09:50:12 2015 -0500 Committer: Joshua McKenzie <jmcken...@apache.org> Committed: Fri Nov 13 09:50:12 2015 -0500 ---------------------------------------------------------------------- .../apache/cassandra/service/StorageProxy.java | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) ----------------------------------------------------------------------
