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/847fef83 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/847fef83 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/847fef83 Branch: refs/heads/trunk Commit: 847fef833670c9853546f97ce6930165245c5c85 Parents: d0e3f45 d66ae75 Author: Joshua McKenzie <jmcken...@apache.org> Authored: Tue Dec 16 11:17:04 2014 -0600 Committer: Joshua McKenzie <jmcken...@apache.org> Committed: Tue Dec 16 11:17:04 2014 -0600 ---------------------------------------------------------------------- conf/cassandra-env.ps1 | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/847fef83/conf/cassandra-env.ps1 ----------------------------------------------------------------------
