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/0ec68f55 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0ec68f55 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/0ec68f55 Branch: refs/heads/trunk Commit: 0ec68f557536e00500ba8b7530760261454cc7bb Parents: 03f3642 7cb57db Author: Aleksey Yeschenko <[email protected]> Authored: Thu Sep 12 18:19:17 2013 +0300 Committer: Aleksey Yeschenko <[email protected]> Committed: Thu Sep 12 18:19:17 2013 +0300 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../apache/cassandra/service/StorageProxy.java | 28 +++++++++++++------- 2 files changed, 20 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/0ec68f55/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/0ec68f55/src/java/org/apache/cassandra/service/StorageProxy.java ----------------------------------------------------------------------
