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/bcbcff3e Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/bcbcff3e Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/bcbcff3e Branch: refs/heads/trunk Commit: bcbcff3e6deafe1f4ab4bf9e1c88407ad70fd9c5 Parents: 70dc320 4bd8626 Author: Jonathan Ellis <[email protected]> Authored: Wed Oct 2 19:11:45 2013 -0500 Committer: Jonathan Ellis <[email protected]> Committed: Wed Oct 2 19:11:45 2013 -0500 ---------------------------------------------------------------------- src/java/org/apache/cassandra/service/StorageProxy.java | 3 +++ 1 file changed, 3 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/bcbcff3e/src/java/org/apache/cassandra/service/StorageProxy.java ----------------------------------------------------------------------
