Merge branch 'cassandra-2.2' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/7476d83b Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7476d83b Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/7476d83b Branch: refs/heads/trunk Commit: 7476d83b44fa58a354fc0c7330b74b8e7ed7a3a3 Parents: 40c3e89 2e92cf8 Author: Josh McKenzie <[email protected]> Authored: Fri Jun 12 18:19:06 2015 -0400 Committer: Josh McKenzie <[email protected]> Committed: Fri Jun 12 18:19:06 2015 -0400 ---------------------------------------------------------------------- bin/cassandra.ps1 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ----------------------------------------------------------------------
