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/bafde3d6 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/bafde3d6 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/bafde3d6 Branch: refs/heads/trunk Commit: bafde3d66ca32a414b4e8167060e733abe686a7a Parents: 542e71c b9153f4 Author: Jonathan Ellis <[email protected]> Authored: Thu Jun 12 15:05:58 2014 -0500 Committer: Jonathan Ellis <[email protected]> Committed: Thu Jun 12 15:05:58 2014 -0500 ---------------------------------------------------------------------- bin/cassandra.bat | 3 +-- bin/cassandra.ps1 | 44 +++++++++++++++++++++++++++++++++++--------- conf/cassandra-env.ps1 | 14 +++++++------- 3 files changed, 43 insertions(+), 18 deletions(-) ----------------------------------------------------------------------
