Merge branch 'cassandra-2.1' into cassandra-2.2
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/8bf453a4 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8bf453a4 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/8bf453a4 Branch: refs/heads/cassandra-3.7 Commit: 8bf453a4491c766ec8a920a12f8a87111a7546e4 Parents: d3db33c 5202147 Author: Josh McKenzie <josh.mcken...@datastax.com> Authored: Tue May 3 14:05:23 2016 -0400 Committer: Josh McKenzie <josh.mcken...@datastax.com> Committed: Tue May 3 14:05:23 2016 -0400 ---------------------------------------------------------------------- conf/cassandra-env.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/8bf453a4/conf/cassandra-env.sh ----------------------------------------------------------------------
