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/1ffd2773 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1ffd2773 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1ffd2773 Branch: refs/heads/trunk Commit: 1ffd277311db9bd15bdfe69629ab948e74a6639f Parents: 593bd61 4bed978 Author: Mikhail Stepura <[email protected]> Authored: Sun Mar 16 11:35:10 2014 -0700 Committer: Mikhail Stepura <[email protected]> Committed: Sun Mar 16 11:35:10 2014 -0700 ---------------------------------------------------------------------- conf/cassandra-env.sh | 11 +++++++++++ 1 file changed, 11 insertions(+) ----------------------------------------------------------------------
