Merge branch 'cassandra-3.0' into cassandra-3.9
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/1d9d5665 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1d9d5665 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1d9d5665 Branch: refs/heads/trunk Commit: 1d9d56659ec5212d3e90dbb91c266088fd7d5b95 Parents: 3dceaab 1991fea Author: Josh McKenzie <[email protected]> Authored: Thu Jun 30 13:36:33 2016 -0400 Committer: Josh McKenzie <[email protected]> Committed: Thu Jun 30 13:36:33 2016 -0400 ---------------------------------------------------------------------- conf/cassandra-env.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/1d9d5665/conf/cassandra-env.ps1 ----------------------------------------------------------------------
