Merge branch 'cassandra-3.0' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/41468538 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/41468538 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/41468538 Branch: refs/heads/trunk Commit: 41468538172c652ab40cc9f9f9e5612c3baa4cbd Parents: c35bfc0 16498de Author: Aleksey Yeschenko <[email protected]> Authored: Thu Aug 6 17:44:53 2015 +0300 Committer: Aleksey Yeschenko <[email protected]> Committed: Thu Aug 6 17:44:53 2015 +0300 ---------------------------------------------------------------------- .../apache/cassandra/service/StorageProxy.java | 24 +++++++++++++++----- 1 file changed, 18 insertions(+), 6 deletions(-) ----------------------------------------------------------------------
