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/aa002bf8 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/aa002bf8 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/aa002bf8 Branch: refs/heads/trunk Commit: aa002bf8107baef6b514e96cdf8857bcf9d8e9ad Parents: cc66b6b 2d60732 Author: Tyler Hobbs <[email protected]> Authored: Wed Apr 2 15:37:07 2014 -0500 Committer: Tyler Hobbs <[email protected]> Committed: Wed Apr 2 15:37:07 2014 -0500 ---------------------------------------------------------------------- CHANGES.txt | 2 ++ src/java/org/apache/cassandra/service/StorageProxy.java | 12 ++++++++++-- 2 files changed, 12 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/aa002bf8/CHANGES.txt ----------------------------------------------------------------------
