Merge branch 'cassandra-2.0' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/14ebfbf7 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/14ebfbf7 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/14ebfbf7 Branch: refs/heads/trunk Commit: 14ebfbf7f8b5091ba2d9a5f6cbb34a00cdb5dbc3 Parents: fe58dff a3796f5 Author: Jonathan Ellis <[email protected]> Authored: Fri Dec 13 22:11:35 2013 -0600 Committer: Jonathan Ellis <[email protected]> Committed: Fri Dec 13 22:11:35 2013 -0600 ---------------------------------------------------------------------- CHANGES.txt | 3 ++- .../cassandra/locator/AbstractReplicationStrategy.java | 11 ++++++----- 2 files changed, 8 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/14ebfbf7/CHANGES.txt ----------------------------------------------------------------------
