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/e8500c72 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e8500c72 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e8500c72 Branch: refs/heads/cassandra-2.1 Commit: e8500c72c7ee117bcb55ac728ee6bbd612eba5b3 Parents: d5e5659 ac1d5bd Author: Brandon Williams <brandonwilli...@apache.org> Authored: Thu Jun 26 11:02:06 2014 -0500 Committer: Brandon Williams <brandonwilli...@apache.org> Committed: Thu Jun 26 11:02:06 2014 -0500 ---------------------------------------------------------------------- conf/cassandra.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/e8500c72/conf/cassandra.yaml ----------------------------------------------------------------------
