Merge branch 'cassandra-1.2' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/635e2138 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/635e2138 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/635e2138 Branch: refs/heads/trunk Commit: 635e2138055353a32852badb6e31f3ad9f5bee73 Parents: 7d5490b 02ea439 Author: Jonathan Ellis <jbel...@apache.org> Authored: Tue Feb 26 09:49:31 2013 -0600 Committer: Jonathan Ellis <jbel...@apache.org> Committed: Tue Feb 26 09:49:31 2013 -0600 ---------------------------------------------------------------------- conf/cassandra.yaml | 10 +++++++++- 1 files changed, 9 insertions(+), 1 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/635e2138/conf/cassandra.yaml ----------------------------------------------------------------------
