Updated Branches: refs/heads/cassandra-1.1 a7da0295d -> 3b3686460 refs/heads/cassandra-1.2 3d9d51780 -> 1559b4971 refs/heads/trunk 59e3f3b9e -> 3b21f6917
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/3b21f691 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3b21f691 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3b21f691 Branch: refs/heads/trunk Commit: 3b21f691755c38a731ee9db4bb88df7600a3e8d7 Parents: 59e3f3b 1559b49 Author: Brandon Williams <[email protected]> Authored: Tue Jan 22 19:26:32 2013 -0600 Committer: Brandon Williams <[email protected]> Committed: Tue Jan 22 19:26:32 2013 -0600 ---------------------------------------------------------------------- conf/cassandra.yaml | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/3b21f691/conf/cassandra.yaml ----------------------------------------------------------------------
