Merge branch 'cassandra-2.1' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/1d05e8ea Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1d05e8ea Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1d05e8ea Branch: refs/heads/trunk Commit: 1d05e8ea7a72913d3bb79869b0d231d288286f66 Parents: ed1f394 46c4f0b Author: Brandon Williams <brandonwilli...@apache.org> Authored: Thu Oct 16 11:58:00 2014 -0500 Committer: Brandon Williams <brandonwilli...@apache.org> Committed: Thu Oct 16 11:58:00 2014 -0500 ---------------------------------------------------------------------- conf/cassandra.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/1d05e8ea/conf/cassandra.yaml ----------------------------------------------------------------------
