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/a3d9e6c4 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a3d9e6c4 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a3d9e6c4 Branch: refs/heads/cassandra-3.0 Commit: a3d9e6c479e62c1641173d9c6a2af2212b1a961d Parents: 7ad1da5 2d477a4 Author: Joshua McKenzie <jmcken...@apache.org> Authored: Mon Aug 24 12:44:34 2015 -0400 Committer: Joshua McKenzie <jmcken...@apache.org> Committed: Mon Aug 24 12:44:34 2015 -0400 ---------------------------------------------------------------------- bin/cassandra.ps1 | 88 ++++++++------------------------------------- conf/cassandra-env.ps1 | 34 +++++++++--------- 2 files changed, 30 insertions(+), 92 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/a3d9e6c4/conf/cassandra-env.ps1 ----------------------------------------------------------------------
