Merge branch 'cassandra-3.3' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/650d76d7 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/650d76d7 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/650d76d7 Branch: refs/heads/trunk Commit: 650d76d7193a5840aa373a6caf9639a57ecf87f7 Parents: 63ffe83 bd2785e Author: Sylvain Lebresne <[email protected]> Authored: Tue Jan 5 18:02:34 2016 +0100 Committer: Sylvain Lebresne <[email protected]> Committed: Tue Jan 5 18:02:34 2016 +0100 ---------------------------------------------------------------------- CHANGES.txt | 1 + NEWS.txt | 2 ++ conf/cassandra-env.ps1 | 3 +++ conf/cassandra-env.sh | 5 ++++- conf/jvm.options | 18 +++++++++--------- debian/patches/002cassandra_logdir_fix.dpatch | 18 +++++++++++++++--- 6 files changed, 34 insertions(+), 13 deletions(-) ----------------------------------------------------------------------
