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/b12413d4 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b12413d4 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b12413d4 Branch: refs/heads/trunk Commit: b12413d4e260d30f175c19e36a772d003aec0895 Parents: 0ac03a2 950b1a3 Author: Joshua McKenzie <[email protected]> Authored: Mon Mar 14 18:02:19 2016 -0400 Committer: Joshua McKenzie <[email protected]> Committed: Mon Mar 14 18:02:19 2016 -0400 ---------------------------------------------------------------------- .../apache/cassandra/service/StorageProxy.java | 35 ++++++++++---------- 1 file changed, 17 insertions(+), 18 deletions(-) ----------------------------------------------------------------------
