Merge branch 'cassandra-1.2' into cassandra-2.0.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5bf1fc13 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5bf1fc13 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5bf1fc13 Branch: refs/heads/cassandra-2.0 Commit: 5bf1fc13fd1d2aaa6f08784c8810558bf1b58ce9 Parents: 3e516a3 1d5ecab Author: Sylvain Lebresne <sylv...@datastax.com> Authored: Mon Aug 19 17:21:06 2013 +0200 Committer: Sylvain Lebresne <sylv...@datastax.com> Committed: Mon Aug 19 17:21:06 2013 +0200 ---------------------------------------------------------------------- conf/cassandra.yaml | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/5bf1fc13/conf/cassandra.yaml ----------------------------------------------------------------------
