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/6cb1f077 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6cb1f077 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6cb1f077 Branch: refs/heads/trunk Commit: 6cb1f0779a981a9743e461d7626a4049a3d7faad Parents: 9288159 c1c3375 Author: Joshua McKenzie <josh.mcken...@datastax.com> Authored: Mon Sep 8 15:32:36 2014 -0500 Committer: Joshua McKenzie <josh.mcken...@datastax.com> Committed: Mon Sep 8 15:32:36 2014 -0500 ---------------------------------------------------------------------- bin/stop-server.ps1 | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) ----------------------------------------------------------------------
