Merge branch 'cassandra-3.0' into cassandra-3.3
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/7fbc39b7 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7fbc39b7 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/7fbc39b7 Branch: refs/heads/cassandra-3.3 Commit: 7fbc39b743f7a08cb03f6b83bebe34c1bc342b9a Parents: 10c1e65 f937c8b Author: Sylvain Lebresne <sylv...@datastax.com> Authored: Wed Jan 6 14:44:45 2016 +0100 Committer: Sylvain Lebresne <sylv...@datastax.com> Committed: Wed Jan 6 14:44:45 2016 +0100 ---------------------------------------------------------------------- conf/cassandra-env.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/7fbc39b7/conf/cassandra-env.sh ----------------------------------------------------------------------
