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/56e48423 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/56e48423 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/56e48423 Branch: refs/heads/trunk Commit: 56e4842321a1158be2f1f738205c56c6e5b82d73 Parents: 706058c f5526d5 Author: Aleksey Yeschenko <alek...@apache.org> Authored: Thu Dec 12 20:57:09 2013 +0300 Committer: Aleksey Yeschenko <alek...@apache.org> Committed: Thu Dec 12 20:57:09 2013 +0300 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/service/StorageProxy.java | 3 +-- 2 files changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/56e48423/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/56e48423/src/java/org/apache/cassandra/service/StorageProxy.java ----------------------------------------------------------------------
