Merge branch 'cassandra-2.0' into cassandra-2.1.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/df7bd7f7 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/df7bd7f7 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/df7bd7f7 Branch: refs/heads/cassandra-2.1.0 Commit: df7bd7f725f6df5102730de89647418dd9f9473d Parents: d872e2c 8754809 Author: Brandon Williams <brandonwilli...@apache.org> Authored: Mon Jul 21 07:50:18 2014 -0500 Committer: Brandon Williams <brandonwilli...@apache.org> Committed: Mon Jul 21 07:50:18 2014 -0500 ---------------------------------------------------------------------- conf/cassandra-env.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/df7bd7f7/conf/cassandra-env.sh ----------------------------------------------------------------------
