Merge branch 'cassandra-1.1' into cassandra-1.2.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/fc5a0cc2 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/fc5a0cc2 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/fc5a0cc2 Branch: refs/heads/trunk Commit: fc5a0cc293adad16050d3dc232495439a42d6bfe Parents: d791e0b ca02176 Author: Jonathan Ellis <jbel...@apache.org> Authored: Tue Dec 11 12:37:55 2012 -0600 Committer: Jonathan Ellis <jbel...@apache.org> Committed: Tue Dec 11 12:37:55 2012 -0600 ---------------------------------------------------------------------- conf/cassandra.yaml | 15 +++++++++------ 1 files changed, 9 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/fc5a0cc2/conf/cassandra.yaml ----------------------------------------------------------------------