Merge branch 'cassandra-3.7' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/17d30c9e Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/17d30c9e Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/17d30c9e Branch: refs/heads/trunk Commit: 17d30c9e52693e3f9dee3f07fb8838273dd25daf Parents: b0806f8 54d7fc4 Author: Josh McKenzie <[email protected]> Authored: Tue May 3 14:07:12 2016 -0400 Committer: Josh McKenzie <[email protected]> Committed: Tue May 3 14:07:12 2016 -0400 ---------------------------------------------------------------------- conf/cassandra-env.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ----------------------------------------------------------------------
