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/340ce90e Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/340ce90e Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/340ce90e Branch: refs/heads/trunk Commit: 340ce90e92a07f8d4f5150e25a977e20817e62d3 Parents: dee30cc d6322a7 Author: Jonathan Ellis <[email protected]> Authored: Wed Jun 18 14:01:11 2014 -0500 Committer: Jonathan Ellis <[email protected]> Committed: Wed Jun 18 14:01:11 2014 -0500 ---------------------------------------------------------------------- CHANGES.txt | 3 ++- bin/cassandra.ps1 | 22 ++++++---------------- conf/cassandra-env.ps1 | 2 +- 3 files changed, 9 insertions(+), 18 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/340ce90e/CHANGES.txt ----------------------------------------------------------------------
