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/bce594f3 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/bce594f3 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/bce594f3 Branch: refs/heads/trunk Commit: bce594f38b2507266610e092058bd08095e56255 Parents: 2520f2f 2fb089e Author: Jonathan Ellis <jbel...@apache.org> Authored: Thu Sep 26 17:10:51 2013 -0500 Committer: Jonathan Ellis <jbel...@apache.org> Committed: Thu Sep 26 17:10:51 2013 -0500 ---------------------------------------------------------------------- conf/cassandra.yaml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) ----------------------------------------------------------------------
