Merge branch 'cassandra-2.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/cb62ef40 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/cb62ef40 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/cb62ef40 Branch: refs/heads/cassandra-2.1 Commit: cb62ef401972d4674b5d810019bd3575b95f9e8d Parents: ec09753 0e272c2 Author: Brandon Williams <brandonwilli...@apache.org> Authored: Wed Aug 27 10:11:20 2014 -0500 Committer: Brandon Williams <brandonwilli...@apache.org> Committed: Wed Aug 27 10:11:20 2014 -0500 ---------------------------------------------------------------------- conf/cassandra-env.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/cb62ef40/conf/cassandra-env.sh ----------------------------------------------------------------------
