Merge branch 'cassandra-3.0' into cassandra-3.7

Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/54d7fc4b
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/54d7fc4b
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/54d7fc4b

Branch: refs/heads/trunk
Commit: 54d7fc4b021a7b4b1e9db16131b815cdfea1b88f
Parents: 0095499 c7d216e
Author: Josh McKenzie <[email protected]>
Authored: Tue May 3 14:06:57 2016 -0400
Committer: Josh McKenzie <[email protected]>
Committed: Tue May 3 14:06:57 2016 -0400

----------------------------------------------------------------------
 conf/cassandra-env.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/54d7fc4b/conf/cassandra-env.sh
----------------------------------------------------------------------

Reply via email to