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/97dc8d52 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/97dc8d52 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/97dc8d52 Branch: refs/heads/trunk Commit: 97dc8d525574a68a43fb05cf41d88c3342a68e72 Parents: 39bc5de f8783b7 Author: Joshua McKenzie <jmcken...@apache.org> Authored: Fri Nov 6 13:42:49 2015 -0500 Committer: Joshua McKenzie <jmcken...@apache.org> Committed: Fri Nov 6 13:42:49 2015 -0500 ---------------------------------------------------------------------- bin/cassandra.ps1 | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) ----------------------------------------------------------------------