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/d30b7451 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d30b7451 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d30b7451 Branch: refs/heads/trunk Commit: d30b745154da9daf0fd91dfc758a6b39e69f4a16 Parents: e02d5b3 02ffaff Author: Aleksey Yeschenko <alek...@apache.org> Authored: Wed Apr 30 03:14:11 2014 +0200 Committer: Aleksey Yeschenko <alek...@apache.org> Committed: Wed Apr 30 03:14:11 2014 +0200 ---------------------------------------------------------------------- src/java/org/apache/cassandra/service/StorageProxy.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) ----------------------------------------------------------------------
