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/a842a968 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a842a968 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a842a968 Branch: refs/heads/trunk Commit: a842a9681054a441b3980d554b0911da364dfdd5 Parents: c7ad00e 0294fd8 Author: Josh McKenzie <jmcken...@apache.org> Authored: Tue Jun 28 13:48:13 2016 -0400 Committer: Josh McKenzie <jmcken...@apache.org> Committed: Tue Jun 28 13:48:13 2016 -0400 ---------------------------------------------------------------------- conf/cassandra-env.ps1 | 1 + conf/cassandra-env.sh | 1 + 2 files changed, 2 insertions(+) ----------------------------------------------------------------------
