Merge branch cassandra-3.0 into cassandra-3.9
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/0c771a2d Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0c771a2d Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/0c771a2d Branch: refs/heads/cassandra-3.8 Commit: 0c771a2db1d94901b4c7b194b9b71a115a1dc828 Parents: f4c3e14 c85749e Author: Benjamin Lerer <b.le...@gmail.com> Authored: Fri Aug 12 15:40:10 2016 +0200 Committer: Benjamin Lerer <b.le...@gmail.com> Committed: Fri Aug 12 15:40:55 2016 +0200 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../apache/cassandra/service/StorageProxy.java | 49 +++++++++++++------- 2 files changed, 34 insertions(+), 16 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/0c771a2d/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/0c771a2d/src/java/org/apache/cassandra/service/StorageProxy.java ----------------------------------------------------------------------