Merge branch 'cassandra-2.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/46c4f0b5 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/46c4f0b5 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/46c4f0b5 Branch: refs/heads/trunk Commit: 46c4f0b583583aa74b1f860b04a67e7bcec76ad1 Parents: d4a7d58 e938839 Author: Brandon Williams <brandonwilli...@apache.org> Authored: Thu Oct 16 11:57:49 2014 -0500 Committer: Brandon Williams <brandonwilli...@apache.org> Committed: Thu Oct 16 11:57:49 2014 -0500 ---------------------------------------------------------------------- conf/cassandra.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/46c4f0b5/conf/cassandra.yaml ----------------------------------------------------------------------
