Merge branch 'cassandra-3.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/815f77c4 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/815f77c4 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/815f77c4 Branch: refs/heads/trunk Commit: 815f77c48131a778498f2bfe7c81f62768a41176 Parents: 5f50e28 5887515 Author: Sylvain Lebresne <sylv...@datastax.com> Authored: Fri Nov 20 13:21:42 2015 +0100 Committer: Sylvain Lebresne <sylv...@datastax.com> Committed: Fri Nov 20 13:21:42 2015 +0100 ---------------------------------------------------------------------- conf/jvm.options | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) ----------------------------------------------------------------------
