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/a9060f03 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a9060f03 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a9060f03 Branch: refs/heads/trunk Commit: a9060f0335b4a7e4dd38b6ea012ae9d2c6f3d2a7 Parents: c0c513b fa909cc Author: Joshua McKenzie <jmcken...@apache.org> Authored: Mon Oct 19 15:12:57 2015 -0400 Committer: Joshua McKenzie <jmcken...@apache.org> Committed: Mon Oct 19 15:12:57 2015 -0400 ---------------------------------------------------------------------- bin/cassandra.ps1 | 10 +++++----- conf/cassandra-env.ps1 | 5 +++++ 2 files changed, 10 insertions(+), 5 deletions(-) ----------------------------------------------------------------------
