Merge branch 'cassandra-2.2' into cassandra-3.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b294058b Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b294058b Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b294058b Branch: refs/heads/cassandra-3.0 Commit: b294058b67cd33c4834b06c76613fbf1483348de Parents: 99e0c90 58bee04 Author: Joshua McKenzie <jmcken...@apache.org> Authored: Fri Aug 14 15:23:27 2015 -0400 Committer: Joshua McKenzie <jmcken...@apache.org> Committed: Fri Aug 14 15:23:27 2015 -0400 ---------------------------------------------------------------------- bin/nodetool.bat | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ----------------------------------------------------------------------
