Merge branch 'cassandra-1.2' into cassandra-2.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/4bd86261 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4bd86261 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/4bd86261 Branch: refs/heads/cassandra-2.0 Commit: 4bd8626189fe32e46f6ef267fff0e19f54cefc3e Parents: e7c90e0 c8f0e3a Author: Jonathan Ellis <[email protected]> Authored: Wed Oct 2 19:11:39 2013 -0500 Committer: Jonathan Ellis <[email protected]> Committed: Wed Oct 2 19:11:39 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/4bd86261/src/java/org/apache/cassandra/service/StorageProxy.java ----------------------------------------------------------------------
