Merge branch 'cassandra-1.2' into cassandra-2.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/7ae61784 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7ae61784 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/7ae61784 Branch: refs/heads/cassandra-2.0 Commit: 7ae617845609153cdb28a25ed7c725d03724d00c Parents: f7f9de5 9771cea Author: Jonathan Ellis <jbel...@apache.org> Authored: Fri Jan 24 08:19:57 2014 +0900 Committer: Jonathan Ellis <jbel...@apache.org> Committed: Fri Jan 24 08:19:57 2014 +0900 ---------------------------------------------------------------------- .../org/apache/cassandra/locator/AbstractReplicationStrategy.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/7ae61784/src/java/org/apache/cassandra/locator/AbstractReplicationStrategy.java ----------------------------------------------------------------------
