You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by jb...@apache.org on 2016/07/26 15:58:37 UTC
[09/12] cassandra git commit: Merge branch 'cassandra-2.2' into
cassandra-3.0
Merge branch 'cassandra-2.2' into cassandra-3.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/023d2e98
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/023d2e98
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/023d2e98
Branch: refs/heads/cassandra-3.9
Commit: 023d2e98f1a49221c773f2c1c6fb533d6bcc059a
Parents: 0bb133e 04ef62c
Author: Jonathan Ellis <jb...@apache.org>
Authored: Tue Jul 26 10:54:55 2016 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Tue Jul 26 10:54:55 2016 -0500
----------------------------------------------------------------------
conf/cassandra.yaml | 15 +++++++++------
1 file changed, 9 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/023d2e98/conf/cassandra.yaml
----------------------------------------------------------------------