Merge branch 'cassandra-2.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/06b2bd3b Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/06b2bd3b Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/06b2bd3b Branch: refs/heads/trunk Commit: 06b2bd3b886041b9e7904138295532939a67540f Parents: 34962c3 4cc5fd1 Author: Jonathan Ellis <[email protected]> Authored: Wed Jun 3 10:32:08 2015 -0700 Committer: Jonathan Ellis <[email protected]> Committed: Wed Jun 3 10:32:08 2015 -0700 ---------------------------------------------------------------------- CHANGES.txt | 1 + NEWS.txt | 13 +++++++++++++ conf/cassandra.yaml | 11 +++++++---- 3 files changed, 21 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/06b2bd3b/CHANGES.txt ----------------------------------------------------------------------
