Merge branch 'cassandra-2.1' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/68514026 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/68514026 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/68514026 Branch: refs/heads/trunk Commit: 685140267ed6e88891dee2568ebac8a1f805d6db Parents: 2cba3fc dbcc4ea Author: Joshua McKenzie <[email protected]> Authored: Wed Sep 10 09:12:52 2014 -0700 Committer: Joshua McKenzie <[email protected]> Committed: Wed Sep 10 09:12:52 2014 -0700 ---------------------------------------------------------------------- bin/cassandra.ps1 | 29 +++++++++++++++++++++++++---- 1 file changed, 25 insertions(+), 4 deletions(-) ----------------------------------------------------------------------
