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/4e334ab8 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4e334ab8 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/4e334ab8 Branch: refs/heads/trunk Commit: 4e334ab82858972b768920dc2f752ea1f283ec2c Parents: fe05727 7035cfc Author: Aleksey Yeschenko <[email protected]> Authored: Sun Aug 17 20:50:42 2014 +0300 Committer: Aleksey Yeschenko <[email protected]> Committed: Sun Aug 17 20:50:42 2014 +0300 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../org/apache/cassandra/client/RingCache.java | 58 ++++++++++---------- .../apache/cassandra/hadoop/ConfigHelper.java | 11 ++++ 3 files changed, 40 insertions(+), 30 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/4e334ab8/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/4e334ab8/src/java/org/apache/cassandra/hadoop/ConfigHelper.java ----------------------------------------------------------------------
