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/d079c76d Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d079c76d Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d079c76d Branch: refs/heads/trunk Commit: d079c76d21fd3ee5672bc3c617fa8174af405ec4 Parents: a53f5d3 929eaa7 Author: Aleksey Yeschenko <alek...@apache.org> Authored: Wed May 28 23:27:08 2014 +0300 Committer: Aleksey Yeschenko <alek...@apache.org> Committed: Wed May 28 23:27:08 2014 +0300 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../org/apache/cassandra/tools/Shuffle.java | 287 ++++++++----------- 2 files changed, 122 insertions(+), 166 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/d079c76d/CHANGES.txt ----------------------------------------------------------------------
