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/d224c0f8 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d224c0f8 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d224c0f8 Branch: refs/heads/trunk Commit: d224c0f87c3f761572e22333dea2b2b00d05ed67 Parents: 8a788e7 02d1e74 Author: Brandon Williams <[email protected]> Authored: Mon Apr 21 14:43:41 2014 -0500 Committer: Brandon Williams <[email protected]> Committed: Mon Apr 21 14:43:41 2014 -0500 ---------------------------------------------------------------------- conf/cassandra.yaml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) ----------------------------------------------------------------------
