Merge branch 'cassandra-2.1.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/c70216a5 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c70216a5 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c70216a5 Branch: refs/heads/trunk Commit: c70216a5b323bdc1e30ae51d3316e929770c1e89 Parents: fbe9630 721afae Author: Tyler Hobbs <ty...@datastax.com> Authored: Tue Jul 15 18:23:10 2014 -0500 Committer: Tyler Hobbs <ty...@datastax.com> Committed: Tue Jul 15 18:23:10 2014 -0500 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/tools/NodeTool.java | 7 +++++-- 2 files changed, 6 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/c70216a5/CHANGES.txt ----------------------------------------------------------------------
