Merge branch 'cassandra-2.1' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/fc770376 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/fc770376 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/fc770376 Branch: refs/heads/trunk Commit: fc770376b2df5cbc042a89a5269f7b7d89ee1aa6 Parents: 90783a1 fcd9a37 Author: Jonathan Ellis <[email protected]> Authored: Fri Mar 14 14:27:33 2014 -0500 Committer: Jonathan Ellis <[email protected]> Committed: Fri Mar 14 14:27:33 2014 -0500 ---------------------------------------------------------------------- src/java/org/apache/cassandra/service/StorageProxy.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ----------------------------------------------------------------------
