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/857de554 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/857de554 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/857de554 Branch: refs/heads/trunk Commit: 857de554066ecbe507ebab13b9cfe6a2749c403f Parents: 6ce8b3f 745ddd1 Author: Aleksey Yeschenko <[email protected]> Authored: Thu Dec 11 15:20:56 2014 +0100 Committer: Aleksey Yeschenko <[email protected]> Committed: Thu Dec 11 15:20:56 2014 +0100 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../org/apache/cassandra/service/StorageProxy.java | 16 +++++++++++++++- 2 files changed, 16 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/857de554/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/857de554/src/java/org/apache/cassandra/service/StorageProxy.java ----------------------------------------------------------------------
