Merge branch 'cassandra-3.0' into trunk

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

Branch: refs/heads/trunk
Commit: 0d2603cf99012171a3f8a0ee3219de88458db5ea
Parents: 17f8788 45eba1a
Author: Joshua McKenzie <jmcken...@apache.org>
Authored: Tue Sep 1 16:29:56 2015 -0400
Committer: Joshua McKenzie <jmcken...@apache.org>
Committed: Tue Sep 1 16:29:56 2015 -0400

----------------------------------------------------------------------
 conf/cassandra-env.ps1 | 4 ----
 1 file changed, 4 deletions(-)
----------------------------------------------------------------------


Reply via email to