Merge branch 'cassandra-2.0' into cassandra-2.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e4e3fd91 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e4e3fd91 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e4e3fd91 Branch: refs/heads/trunk Commit: e4e3fd91cdcb6cdad9c72bdb3214f4105971e964 Parents: a3234e1 61bd688 Author: Aleksey Yeschenko <alek...@apache.org> Authored: Sat Jan 17 03:41:34 2015 +0300 Committer: Aleksey Yeschenko <alek...@apache.org> Committed: Sat Jan 17 03:41:34 2015 +0300 ---------------------------------------------------------------------- CHANGES.txt | 2 +- src/java/org/apache/cassandra/service/StorageProxy.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/e4e3fd91/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/e4e3fd91/src/java/org/apache/cassandra/service/StorageProxy.java ----------------------------------------------------------------------
