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/66429d61 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/66429d61 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/66429d61 Branch: refs/heads/trunk Commit: 66429d6189cc41386175ba4f2617932ec34f80a4 Parents: 56c76be 8c58dd3 Author: Brandon Williams <[email protected]> Authored: Wed May 7 16:24:52 2014 -0500 Committer: Brandon Williams <[email protected]> Committed: Wed May 7 16:24:52 2014 -0500 ---------------------------------------------------------------------- conf/cassandra-env.sh | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) ----------------------------------------------------------------------
