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/fbf52e65 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/fbf52e65 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/fbf52e65 Branch: refs/heads/trunk Commit: fbf52e65f13844a142fb99164558c210b3abfb8f Parents: 3b5ab3a 0522226 Author: Joshua McKenzie <[email protected]> Authored: Mon Jul 13 17:54:14 2015 -0400 Committer: Joshua McKenzie <[email protected]> Committed: Mon Jul 13 17:54:14 2015 -0400 ---------------------------------------------------------------------- bin/stop-server.ps1 | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) ----------------------------------------------------------------------
