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/9b06e48b Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9b06e48b Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/9b06e48b Branch: refs/heads/trunk Commit: 9b06e48bb7fc4ce0cb95778e2aa961cccaea5d1c Parents: c8d0f11 7d8a56d Author: Jonathan Ellis <[email protected]> Authored: Thu Oct 3 12:12:43 2013 -0500 Committer: Jonathan Ellis <[email protected]> Committed: Thu Oct 3 12:12:43 2013 -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/9b06e48b/src/java/org/apache/cassandra/service/StorageProxy.java ----------------------------------------------------------------------
