You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@cassandra.apache.org by pa...@apache.org on 2017/01/06 13:01:21 UTC

[5/5] cassandra git commit: Merge branch 'cassandra-3.X' into trunk

Merge branch 'cassandra-3.X' into trunk


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/a1f0dcdc
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a1f0dcdc
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a1f0dcdc

Branch: refs/heads/trunk
Commit: a1f0dcdcb757065ff7c98890e6f7bfd669cd3148
Parents: 640795d 2e675b5
Author: Paulo Motta <pa...@apache.org>
Authored: Fri Jan 6 11:00:12 2017 -0200
Committer: Paulo Motta <pa...@apache.org>
Committed: Fri Jan 6 11:00:12 2017 -0200

----------------------------------------------------------------------
 conf/jvm.options | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/a1f0dcdc/conf/jvm.options
----------------------------------------------------------------------