Merge branch 'cassandra-3.0' into cassandra-3.5
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/950b1a3d Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/950b1a3d Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/950b1a3d Branch: refs/heads/cassandra-3.5 Commit: 950b1a3d2e5ef544a29013f3dc338675ae7682cf Parents: de44900 a479fb0 Author: Joshua McKenzie <joshua.mcken...@gmail.com> Authored: Mon Mar 14 18:02:06 2016 -0400 Committer: Joshua McKenzie <joshua.mcken...@gmail.com> Committed: Mon Mar 14 18:02:06 2016 -0400 ---------------------------------------------------------------------- .../apache/cassandra/service/StorageProxy.java | 35 ++++++++++---------- 1 file changed, 17 insertions(+), 18 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/950b1a3d/src/java/org/apache/cassandra/service/StorageProxy.java ----------------------------------------------------------------------
