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/89454130 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/89454130 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/89454130 Branch: refs/heads/trunk Commit: 894541304b5b4fe0411e6d5dd8fa7f832ab24d82 Parents: 4a748f3 0997ad6 Author: Joshua McKenzie <[email protected]> Authored: Tue Aug 11 10:09:22 2015 -0400 Committer: Joshua McKenzie <[email protected]> Committed: Tue Aug 11 10:09:22 2015 -0400 ---------------------------------------------------------------------- conf/cassandra-env.ps1 | 6 ++++++ conf/cassandra-env.sh | 6 +++--- 2 files changed, 9 insertions(+), 3 deletions(-) ----------------------------------------------------------------------
