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/2dfa90e2 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2dfa90e2 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2dfa90e2 Branch: refs/heads/trunk Commit: 2dfa90e2b64be28cf1143186fb0decf3a1681f5d Parents: 26bde8d 17193da Author: Tyler Hobbs <ty...@datastax.com> Authored: Tue Aug 12 13:59:33 2014 -0500 Committer: Tyler Hobbs <ty...@datastax.com> Committed: Tue Aug 12 13:59:33 2014 -0500 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../apache/cassandra/service/StorageProxy.java | 44 ++++++++++++-------- 2 files changed, 28 insertions(+), 17 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/2dfa90e2/CHANGES.txt ----------------------------------------------------------------------
