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/7b24b870 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7b24b870 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/7b24b870 Branch: refs/heads/trunk Commit: 7b24b87030f4c9dca434a180b54a3bae9e171307 Parents: 99ba549 b29d882 Author: Jonathan Ellis <[email protected]> Authored: Thu Jun 5 10:23:26 2014 -0500 Committer: Jonathan Ellis <[email protected]> Committed: Thu Jun 5 10:23:26 2014 -0500 ---------------------------------------------------------------------- CHANGES.txt | 1 + conf/cassandra-env.ps1 | 8 ++++---- 2 files changed, 5 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/7b24b870/CHANGES.txt ----------------------------------------------------------------------
