Merge branch 'cassandra-1.2.0' into cassandra-1.2
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/2d3ee800 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2d3ee800 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2d3ee800 Branch: refs/heads/trunk Commit: 2d3ee8000e14e0060ba7ee23ade5a207c6bb04e2 Parents: dfe3ef9 fc5a0cc Author: Jonathan Ellis <jbel...@apache.org> Authored: Tue Dec 11 12:38:05 2012 -0600 Committer: Jonathan Ellis <jbel...@apache.org> Committed: Tue Dec 11 12:38:05 2012 -0600 ---------------------------------------------------------------------- build.xml | 2 +- conf/cassandra.yaml | 15 +++++++++------ debian/changelog | 6 ++++++ 3 files changed, 16 insertions(+), 7 deletions(-) ----------------------------------------------------------------------
