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