Merge branch 'cassandra-1.2' into cassandra-2.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/2fb089e4 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2fb089e4 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2fb089e4 Branch: refs/heads/cassandra-2.0 Commit: 2fb089e4c8430e4e46f335cf85ee791e1299de35 Parents: 7a87fc1 bdb269a Author: Jonathan Ellis <[email protected]> Authored: Thu Sep 26 17:10:39 2013 -0500 Committer: Jonathan Ellis <[email protected]> Committed: Thu Sep 26 17:10:39 2013 -0500 ---------------------------------------------------------------------- conf/cassandra.yaml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/2fb089e4/conf/cassandra.yaml ----------------------------------------------------------------------
