Merge branch 'cassandra-2.1' into cassandra-2.2
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/2e92cf89 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2e92cf89 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2e92cf89 Branch: refs/heads/trunk Commit: 2e92cf8996f42dc40fade41b73001affdfbd6f7d Parents: a5be8f1 c1702b0 Author: Josh McKenzie <josh.mcken...@datastax.com> Authored: Fri Jun 12 18:18:45 2015 -0400 Committer: Josh McKenzie <josh.mcken...@datastax.com> Committed: Fri Jun 12 18:18:45 2015 -0400 ---------------------------------------------------------------------- bin/cassandra.ps1 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ----------------------------------------------------------------------
