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/51057f4c Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/51057f4c Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/51057f4c Branch: refs/heads/trunk Commit: 51057f4cf7674363c5a65383315dadbe431c70fb Parents: 8f5435d 88b226b Author: Brandon Williams <brandonwilli...@apache.org> Authored: Tue Feb 10 12:19:58 2015 -0600 Committer: Brandon Williams <brandonwilli...@apache.org> Committed: Tue Feb 10 12:19:58 2015 -0600 ---------------------------------------------------------------------- conf/cassandra.yaml | 2 ++ 1 file changed, 2 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/51057f4c/conf/cassandra.yaml ----------------------------------------------------------------------
