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 11:54:08 UTC

[2/2] 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/29a855e1
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/29a855e1
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/29a855e1

Branch: refs/heads/trunk
Commit: 29a855e1bab113b9f748edc050cd615429669253
Parents: 84b9b9a 5c0aacb
Author: Paulo Motta <pa...@apache.org>
Authored: Fri Jan 6 09:53:09 2017 -0200
Committer: Paulo Motta <pa...@apache.org>
Committed: Fri Jan 6 09:53:09 2017 -0200

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


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