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/8e8db1f2 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8e8db1f2 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/8e8db1f2 Branch: refs/heads/cassandra-2.0 Commit: 8e8db1f20688eef9a89e112f2295d160c9c35075 Parents: 6a60304 9d31ac1 Author: Aleksey Yeschenko <alek...@apache.org> Authored: Tue Oct 8 01:56:55 2013 +0800 Committer: Aleksey Yeschenko <alek...@apache.org> Committed: Tue Oct 8 01:56:55 2013 +0800 ---------------------------------------------------------------------- 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/8e8db1f2/src/java/org/apache/cassandra/service/StorageProxy.java ----------------------------------------------------------------------
