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/c4a54978 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c4a54978 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c4a54978 Branch: refs/heads/trunk Commit: c4a54978cad8448802608e34a85f485acc94f88f Parents: 8c511cc d1103f5 Author: Robert Stupp <[email protected]> Authored: Thu Nov 19 10:42:24 2015 +0100 Committer: Robert Stupp <[email protected]> Committed: Thu Nov 19 10:42:24 2015 +0100 ---------------------------------------------------------------------- conf/cassandra.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ----------------------------------------------------------------------
