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/46196286 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/46196286 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/46196286 Branch: refs/heads/trunk Commit: 4619628669500273f1d3f9614f35dde3d4f6b13e Parents: 93c9fb8 0396efc Author: Jonathan Ellis <[email protected]> Authored: Mon Jul 14 07:48:24 2014 -0500 Committer: Jonathan Ellis <[email protected]> Committed: Mon Jul 14 07:48:24 2014 -0500 ---------------------------------------------------------------------- bin/cassandra.bat | 3 ++- bin/cassandra.ps1 | 48 ++++++------------------------------------------ 2 files changed, 8 insertions(+), 43 deletions(-) ----------------------------------------------------------------------
