Merge branch 'cassandra-2.1.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/191cedfd Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/191cedfd Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/191cedfd Branch: refs/heads/trunk Commit: 191cedfd53ebaf45c010a4d0a4ceb5d40474a2c8 Parents: e5bd1c3 63c21a3 Author: Sylvain Lebresne <[email protected]> Authored: Mon Aug 25 15:58:20 2014 +0200 Committer: Sylvain Lebresne <[email protected]> Committed: Mon Aug 25 15:58:20 2014 +0200 ---------------------------------------------------------------------- CHANGES.txt | 4 ++++ .../apache/cassandra/service/StorageProxy.java | 24 +++++++++++++------- 2 files changed, 20 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/191cedfd/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/191cedfd/src/java/org/apache/cassandra/service/StorageProxy.java ----------------------------------------------------------------------
