Merge branch 'cassandra-2.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/3da10f46 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3da10f46 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3da10f46 Branch: refs/heads/trunk Commit: 3da10f469d6a328bad209d723a5997c932284344 Parents: 889da51 56b0e7b Author: Jonathan Ellis <jbel...@apache.org> Authored: Fri Oct 4 16:36:36 2013 -0500 Committer: Jonathan Ellis <jbel...@apache.org> Committed: Fri Oct 4 16:36:36 2013 -0500 ---------------------------------------------------------------------- src/java/org/apache/cassandra/service/StorageProxy.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/3da10f46/src/java/org/apache/cassandra/service/StorageProxy.java ----------------------------------------------------------------------
