Merge branch 'cassandra-2.0' into cassandra-2.1.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/545e2e1c Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/545e2e1c Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/545e2e1c Branch: refs/heads/cassandra-2.1.0 Commit: 545e2e1cba16b8a84a9dcd9c2f6325c272b0f3cb Parents: 6b988fd 93c2754 Author: Jonathan Ellis <[email protected]> Authored: Wed Jul 16 16:17:44 2014 -0500 Committer: Jonathan Ellis <[email protected]> Committed: Wed Jul 16 16:17:44 2014 -0500 ---------------------------------------------------------------------- conf/cassandra.yaml | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/545e2e1c/conf/cassandra.yaml ----------------------------------------------------------------------
