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/779817fe Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/779817fe Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/779817fe Branch: refs/heads/trunk Commit: 779817fe71c1d0a891b414df8194d3350089044a Parents: f7666d5 a8b9e53 Author: Dave Brosius <dbros...@mebigfatguy.com> Authored: Sat Dec 12 18:20:40 2015 -0500 Committer: Dave Brosius <dbros...@mebigfatguy.com> Committed: Sat Dec 12 18:20:40 2015 -0500 ---------------------------------------------------------------------- src/java/org/apache/cassandra/service/StorageProxy.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/779817fe/src/java/org/apache/cassandra/service/StorageProxy.java ----------------------------------------------------------------------
