Merge branch 'cassandra-2.0.0' into cassandra-2.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/dc2c0e78 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/dc2c0e78 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/dc2c0e78 Branch: refs/heads/trunk Commit: dc2c0e786a6b72134b35c25173bd73b43bef65a1 Parents: c3993be 5bf1fc1 Author: Sylvain Lebresne <sylv...@datastax.com> Authored: Mon Aug 19 17:21:31 2013 +0200 Committer: Sylvain Lebresne <sylv...@datastax.com> Committed: Mon Aug 19 17:21:31 2013 +0200 ---------------------------------------------------------------------- build.xml | 2 +- conf/cassandra.yaml | 12 ++++++++---- debian/changelog | 8 +++++++- 3 files changed, 16 insertions(+), 6 deletions(-) ----------------------------------------------------------------------
