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/b966e1ad Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b966e1ad Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b966e1ad Branch: refs/heads/trunk Commit: b966e1ad21a345838a2b50e1790e0257fab30c7f Parents: e43b82b 8e8db1f Author: Aleksey Yeschenko <alek...@apache.org> Authored: Tue Oct 8 02:39:59 2013 +0800 Committer: Aleksey Yeschenko <alek...@apache.org> Committed: Tue Oct 8 02:39:59 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/b966e1ad/src/java/org/apache/cassandra/service/StorageProxy.java ----------------------------------------------------------------------
