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