Merge branch 'cassandra-2.0' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b9260092 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b9260092 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b9260092 Branch: refs/heads/trunk Commit: b9260092dabb90c9a50d773d5a94b184766a50ee Parents: d86e1dd 6348ce0 Author: Brandon Williams <brandonwilli...@apache.org> Authored: Wed Jan 22 15:32:23 2014 -0600 Committer: Brandon Williams <brandonwilli...@apache.org> Committed: Wed Jan 22 15:32:23 2014 -0600 ---------------------------------------------------------------------- conf/cassandra.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/b9260092/conf/cassandra.yaml ----------------------------------------------------------------------
