Merge branch 'cassandra-2.0' into cassandra-2.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/6434ad8b Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6434ad8b Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6434ad8b Branch: refs/heads/cassandra-2.1 Commit: 6434ad8bc901127b67d4b7efd95a36175326aa96 Parents: 94f1107 a5617d6 Author: Aleksey Yeschenko <alek...@apache.org> Authored: Fri Aug 22 21:55:31 2014 +0300 Committer: Aleksey Yeschenko <alek...@apache.org> Committed: Fri Aug 22 21:55:31 2014 +0300 ---------------------------------------------------------------------- .../LimitedLocalNodeFirstLocalBalancingPolicy.java | 17 +++++++++++++++++ .../io/compress/CompressedRandomAccessReader.java | 2 +- .../io/compress/CorruptBlockException.java | 14 ++++++++++++-- 3 files changed, 30 insertions(+), 3 deletions(-) ----------------------------------------------------------------------
