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/5aee1288 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5aee1288 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5aee1288 Branch: refs/heads/cassandra-2.1 Commit: 5aee12883de952079aba417075fafb35b8243439 Parents: 1aea6d5 af646fb Author: Benedict Elliott Smith <bened...@apache.org> Authored: Thu Aug 21 08:53:12 2014 +0700 Committer: Benedict Elliott Smith <bened...@apache.org> Committed: Thu Aug 21 08:53:12 2014 +0700 ---------------------------------------------------------------------- conf/cassandra.yaml | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/5aee1288/conf/cassandra.yaml ----------------------------------------------------------------------
