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/bf21df2c Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/bf21df2c Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/bf21df2c Branch: refs/heads/trunk Commit: bf21df2c3fde0a512438cf9722e065f3100ecff0 Parents: afb52aa 233ef34 Author: Josh McKenzie <[email protected]> Authored: Tue May 5 13:26:59 2015 -0500 Committer: Josh McKenzie <[email protected]> Committed: Tue May 5 13:26:59 2015 -0500 ---------------------------------------------------------------------- conf/cassandra-env.ps1 | 2 +- conf/cassandra-env.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/bf21df2c/conf/cassandra-env.ps1 ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/bf21df2c/conf/cassandra-env.sh ----------------------------------------------------------------------
