Merge branch 'cassandra-2.1.0' into cassandra-2.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/367a3696 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/367a3696 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/367a3696 Branch: refs/heads/trunk Commit: 367a3696b3f6fb670a362562b7ded92f8ad21088 Parents: 4b2e946 545e2e1 Author: Jonathan Ellis <jbel...@apache.org> Authored: Wed Jul 16 16:17:53 2014 -0500 Committer: Jonathan Ellis <jbel...@apache.org> Committed: Wed Jul 16 16:17:53 2014 -0500 ---------------------------------------------------------------------- conf/cassandra.yaml | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/367a3696/conf/cassandra.yaml ----------------------------------------------------------------------
