Merge branch 'cassandra-2.0' into cassandra-2.1.0
Conflicts:
CHANGES.txt
src/java/org/apache/cassandra/tools/NodeCmd.java
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/0623ea86
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0623ea86
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/0623ea86
Branch: refs/heads/cassandra-2.1.0
Commit: 0623ea86aa501ad2c33a02da057ade091d14457a
Parents: f067617 74f3204
Author: Tyler Hobbs <ty...@datastax.com>
Authored: Wed Aug 13 11:34:26 2014 -0500
Committer: Tyler Hobbs <ty...@datastax.com>
Committed: Wed Aug 13 11:34:26 2014 -0500
----------------------------------------------------------------------
----------------------------------------------------------------------
