Merge branch 'cassandra-2.1.0' into cassandra-2.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/0396efc4 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0396efc4 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/0396efc4 Branch: refs/heads/cassandra-2.1 Commit: 0396efc410f943fbfd363f5eeb2fa6d7f73dccfd Parents: b374fd5 9460503 Author: Jonathan Ellis <[email protected]> Authored: Mon Jul 14 07:48:14 2014 -0500 Committer: Jonathan Ellis <[email protected]> Committed: Mon Jul 14 07:48:14 2014 -0500 ---------------------------------------------------------------------- bin/cassandra.bat | 3 ++- bin/cassandra.ps1 | 48 ++++++------------------------------------------ 2 files changed, 8 insertions(+), 43 deletions(-) ----------------------------------------------------------------------
