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:35 UTC
[07/12] cassandra git commit: Merge branch 'cassandra-2.1' into
cassandra-2.2
Merge branch 'cassandra-2.1' into cassandra-2.2
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/04ef62cb
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/04ef62cb
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/04ef62cb
Branch: refs/heads/trunk
Commit: 04ef62cba2a8f19f4e853ceb403f9b9e9e426853
Parents: b92ab60 48a45ed
Author: Jonathan Ellis <jb...@apache.org>
Authored: Tue Jul 26 10:54:43 2016 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Tue Jul 26 10:54:43 2016 -0500
----------------------------------------------------------------------
conf/cassandra.yaml | 15 +++++++++------
1 file changed, 9 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/04ef62cb/conf/cassandra.yaml
----------------------------------------------------------------------