Merge branch 'cassandra-2.0' into cassandra-2.1.0
Conflicts:
bin/cassandra-shuffle.bat
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/8e4415b6
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8e4415b6
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/8e4415b6
Branch: refs/heads/trunk
Commit: 8e4415b697acc2fc25c52cc3031b0b973fe9fd15
Parents: 0947fb8 563a04b
Author: Brandon Williams <brandonwilli...@apache.org>
Authored: Thu Jul 31 15:13:37 2014 -0500
Committer: Brandon Williams <brandonwilli...@apache.org>
Committed: Thu Jul 31 15:13:37 2014 -0500
----------------------------------------------------------------------
bin/cassandra-shuffle.bat | 37 -------------------------------------
1 file changed, 37 deletions(-)
----------------------------------------------------------------------
