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/740bcb54 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/740bcb54 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/740bcb54 Branch: refs/heads/cassandra-2.1 Commit: 740bcb540f2d5a540dcef379dfd7cd50d8916505 Parents: 4a69811 97e74ee Author: Brandon Williams <[email protected]> Authored: Tue Aug 5 17:55:01 2014 -0500 Committer: Brandon Williams <[email protected]> Committed: Tue Aug 5 17:55:01 2014 -0500 ---------------------------------------------------------------------- conf/cassandra-env.sh | 5 +++++ 1 file changed, 5 insertions(+) ----------------------------------------------------------------------
