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/dce6033d Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/dce6033d Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/dce6033d Branch: refs/heads/trunk Commit: dce6033d8170da5914ecfb89c2ebb9806d82c97c Parents: e4a4aa2 ef6fa37 Author: Aleksey Yeschenko <[email protected]> Authored: Mon Mar 9 20:21:21 2015 -0700 Committer: Aleksey Yeschenko <[email protected]> Committed: Mon Mar 9 20:21:21 2015 -0700 ---------------------------------------------------------------------- CHANGES.txt | 3 +++ .../apache/cassandra/locator/AbstractReplicationStrategy.java | 6 ++++++ 2 files changed, 9 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/dce6033d/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/dce6033d/src/java/org/apache/cassandra/locator/AbstractReplicationStrategy.java ----------------------------------------------------------------------
