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/d2b6063a Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d2b6063a Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d2b6063a Branch: refs/heads/trunk Commit: d2b6063ade307684f31d533b55619489f85bd14f Parents: 3ce2ce7 b9c9039 Author: Mikhail Stepura <[email protected]> Authored: Thu May 15 19:29:26 2014 -0700 Committer: Mikhail Stepura <[email protected]> Committed: Thu May 15 19:29:26 2014 -0700 ---------------------------------------------------------------------- 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/d2b6063a/CHANGES.txt ----------------------------------------------------------------------
