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/d93572d5 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d93572d5 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d93572d5 Branch: refs/heads/trunk Commit: d93572d5c319501ac3f824e52e5758b626577e5c Parents: 90477c3 e68ac31 Author: Jonathan Ellis <jbel...@apache.org> Authored: Fri May 30 22:48:51 2014 +0100 Committer: Jonathan Ellis <jbel...@apache.org> Committed: Fri May 30 22:48:51 2014 +0100 ---------------------------------------------------------------------- src/java/org/apache/cassandra/tools/Shuffle.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ----------------------------------------------------------------------
