Merge branch 'cassandra-2.0' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e718467e Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e718467e Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e718467e Branch: refs/heads/trunk Commit: e718467ec471bc5c952c3eaeac8bdc2b3db9eac5 Parents: 4a34a20 1485758 Author: Jonathan Ellis <[email protected]> Authored: Sun Aug 11 21:33:19 2013 -0500 Committer: Jonathan Ellis <[email protected]> Committed: Sun Aug 11 21:33:19 2013 -0500 ---------------------------------------------------------------------- CHANGES.txt | 3 ++- NEWS.txt | 3 +++ conf/cassandra.yaml | 21 +++++++-------------- 3 files changed, 12 insertions(+), 15 deletions(-) ----------------------------------------------------------------------
