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/beea5d68 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/beea5d68 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/beea5d68 Branch: refs/heads/trunk Commit: beea5d68cfadc2065c70bb605db3105130a9c351 Parents: 652a7ea 8aa2b79 Author: Jonathan Ellis <[email protected]> Authored: Thu Jun 26 21:37:05 2014 -0500 Committer: Jonathan Ellis <[email protected]> Committed: Thu Jun 26 21:37:05 2014 -0500 ---------------------------------------------------------------------- CHANGES.txt | 3 +++ src/java/org/apache/cassandra/service/StorageProxy.java | 11 ++++++----- 2 files changed, 9 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/beea5d68/CHANGES.txt ----------------------------------------------------------------------
