Merge branch 'cassandra-2.2' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/9307546b Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9307546b Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/9307546b Branch: refs/heads/trunk Commit: 9307546b6278e50f262257e3513fb26c124dec4c Parents: 622e001 6dfde0e Author: Marcus Eriksson <[email protected]> Authored: Thu Jun 11 09:25:42 2015 +0200 Committer: Marcus Eriksson <[email protected]> Committed: Thu Jun 11 09:25:42 2015 +0200 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/tools/NodeTool.java | 2 ++ 2 files changed, 3 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/9307546b/CHANGES.txt ----------------------------------------------------------------------
