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/bea3a970 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/bea3a970 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/bea3a970 Branch: refs/heads/trunk Commit: bea3a9703c8494c59c89f8d2bd98c563d43faa0f Parents: d314c07 d469b4b Author: Brandon Williams <brandonwilli...@apache.org> Authored: Mon Jan 19 13:47:57 2015 -0600 Committer: Brandon Williams <brandonwilli...@apache.org> Committed: Mon Jan 19 13:47:57 2015 -0600 ---------------------------------------------------------------------- conf/cassandra-env.sh | 4 ++++ 1 file changed, 4 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/bea3a970/conf/cassandra-env.sh ----------------------------------------------------------------------
