Merge branch 'cassandra-3.X' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/58d2b5f4 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/58d2b5f4 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/58d2b5f4 Branch: refs/heads/trunk Commit: 58d2b5f49f81ab573d07eaceac7150ca95d44db4 Parents: a48ebbc 7234c79 Author: Robert Stupp <sn...@snazy-ds15.fritz.box> Authored: Thu Oct 13 15:20:37 2016 +0200 Committer: Robert Stupp <sn...@snazy-ds15.fritz.box> Committed: Thu Oct 13 15:20:37 2016 +0200 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/tools/NodeProbe.java | 11 ++++++++++- .../org/apache/cassandra/tools/nodetool/StopDaemon.java | 3 +-- 3 files changed, 12 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/58d2b5f4/CHANGES.txt ----------------------------------------------------------------------
