You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by sl...@apache.org on 2016/01/05 18:03:17 UTC
[18/19] cassandra git commit: Merge branch 'cassandra-3.0' into
cassandra-3.3
Merge branch 'cassandra-3.0' into cassandra-3.3
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/bd2785e9
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/bd2785e9
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/bd2785e9
Branch: refs/heads/cassandra-3.3
Commit: bd2785e9c25249fcbbd1cb398aee4e4069ba6763
Parents: ea4f649 3e45fa1
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Tue Jan 5 18:02:13 2016 +0100
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Tue Jan 5 18:02:13 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(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/bd2785e9/CHANGES.txt
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/bd2785e9/NEWS.txt
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/bd2785e9/conf/cassandra-env.ps1
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/bd2785e9/conf/cassandra-env.sh
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/bd2785e9/conf/jvm.options
----------------------------------------------------------------------