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