Merge branch 'cassandra-2.2' into cassandra-3.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/12884276 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/12884276 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/12884276 Branch: refs/heads/trunk Commit: 12884276699681e2950529418e45e51f73282d1b Parents: 381cf56 10be826 Author: Joshua McKenzie <jmcken...@apache.org> Authored: Fri Aug 14 11:50:40 2015 -0400 Committer: Joshua McKenzie <jmcken...@apache.org> Committed: Fri Aug 14 11:50:40 2015 -0400 ---------------------------------------------------------------------- bin/cassandra.ps1 | 1 - conf/cassandra-env.ps1 | 1 - 2 files changed, 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/12884276/conf/cassandra-env.ps1 ----------------------------------------------------------------------
