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/374d0cba Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/374d0cba Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/374d0cba Branch: refs/heads/trunk Commit: 374d0cbaed208b61ec7b80b00377b23587744899 Parents: 8174dab e3f4c6d Author: Joshua McKenzie <jmcken...@apache.org> Authored: Fri Oct 31 11:49:18 2014 -0500 Committer: Joshua McKenzie <jmcken...@apache.org> Committed: Fri Oct 31 11:49:18 2014 -0500 ---------------------------------------------------------------------- bin/cassandra.ps1 | 94 +++++++++++++++++++++++++++++++++++++++++++++ conf/cassandra-env.ps1 | 5 +++ 2 files changed, 99 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/374d0cba/conf/cassandra-env.ps1 ----------------------------------------------------------------------
