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/2ba011ed Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2ba011ed Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2ba011ed Branch: refs/heads/trunk Commit: 2ba011ed0251a5964b33e849886c50c5dd58da65 Parents: c3be2fe 0ad5e36 Author: Brandon Williams <[email protected]> Authored: Fri Apr 25 17:02:28 2014 -0500 Committer: Brandon Williams <[email protected]> Committed: Fri Apr 25 17:02:28 2014 -0500 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/tools/NodeTool.java | 8 ++++---- 2 files changed, 5 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/2ba011ed/CHANGES.txt ----------------------------------------------------------------------
