Merge branch 'cassandra-3.0' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/d200822e Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d200822e Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d200822e Branch: refs/heads/trunk Commit: d200822e68a92f5e42c8c9327d678c7026b9bbb2 Parents: 903a54d a3d9e6c Author: Joshua McKenzie <[email protected]> Authored: Mon Aug 24 12:44:48 2015 -0400 Committer: Joshua McKenzie <[email protected]> Committed: Mon Aug 24 12:44:48 2015 -0400 ---------------------------------------------------------------------- bin/cassandra.ps1 | 88 ++++++++------------------------------------- conf/cassandra-env.ps1 | 34 +++++++++--------- 2 files changed, 30 insertions(+), 92 deletions(-) ----------------------------------------------------------------------
