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/edcf9257 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/edcf9257 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/edcf9257 Branch: refs/heads/trunk Commit: edcf9257ef680166d185822ac40d2f37fb638eaa Parents: addba6b 49d64c2 Author: Sylvain Lebresne <[email protected]> Authored: Wed Apr 1 21:43:54 2015 +0200 Committer: Sylvain Lebresne <[email protected]> Committed: Wed Apr 1 21:43:54 2015 +0200 ---------------------------------------------------------------------- CHANGES.txt | 2 ++ src/java/org/apache/cassandra/service/StorageProxy.java | 10 +++++++++- 2 files changed, 11 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/edcf9257/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/edcf9257/src/java/org/apache/cassandra/service/StorageProxy.java ----------------------------------------------------------------------
