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/f807b8c6 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f807b8c6 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f807b8c6 Branch: refs/heads/cassandra-3.0 Commit: f807b8c6ed1af297d29314399b9f250a966581f4 Parents: 7159a75 728f94e Author: Joshua McKenzie <jmcken...@apache.org> Authored: Mon Oct 19 15:11:43 2015 -0400 Committer: Joshua McKenzie <jmcken...@apache.org> Committed: Mon Oct 19 15:11:43 2015 -0400 ---------------------------------------------------------------------- bin/cassandra.ps1 | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) ----------------------------------------------------------------------
