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/2240455f Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2240455f Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2240455f Branch: refs/heads/trunk Commit: 2240455f0e963e410c274dfc43f725111c115d5a Parents: 178d7b6 d69728f Author: Sylvain Lebresne <sylv...@datastax.com> Authored: Tue Dec 9 21:11:19 2014 +0100 Committer: Sylvain Lebresne <sylv...@datastax.com> Committed: Tue Dec 9 21:11:19 2014 +0100 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../cassandra/exceptions/UnavailableException.java | 7 ++++++- .../org/apache/cassandra/service/StorageProxy.java | 14 +++++++++++++- 3 files changed, 20 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/2240455f/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/2240455f/src/java/org/apache/cassandra/service/StorageProxy.java ----------------------------------------------------------------------
