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/0cd17695 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0cd17695 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/0cd17695 Branch: refs/heads/trunk Commit: 0cd17695f64eedc8eba5a11e019a450dec44fb1a Parents: ea39c49 f8229c3 Author: Jonathan Ellis <jbel...@apache.org> Authored: Tue Mar 25 13:28:52 2014 -0500 Committer: Jonathan Ellis <jbel...@apache.org> Committed: Tue Mar 25 13:28:52 2014 -0500 ---------------------------------------------------------------------- conf/cassandra.yaml | 60 ++++++++++++++++++++---------------------------- 1 file changed, 25 insertions(+), 35 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/0cd17695/conf/cassandra.yaml ----------------------------------------------------------------------
