Merge branch 'cassandra-2.1' into cassandra-2.2
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/8a94432d Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8a94432d Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/8a94432d Branch: refs/heads/cassandra-2.2 Commit: 8a94432d5ec2fcac45026952d17b0780376e2a2e Parents: 50da872 bc1058f Author: Aleksey Yeschenko <alek...@apache.org> Authored: Wed Oct 14 16:56:34 2015 +0100 Committer: Aleksey Yeschenko <alek...@apache.org> Committed: Wed Oct 14 16:56:34 2015 +0100 ---------------------------------------------------------------------- src/java/org/apache/cassandra/service/StorageProxy.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/8a94432d/src/java/org/apache/cassandra/service/StorageProxy.java ----------------------------------------------------------------------
