Merge branch 'cassandra-2.1' into cassandra-2.2
Conflicts:
conf/cassandra.yaml
src/java/org/apache/cassandra/config/Config.java
src/java/org/apache/cassandra/db/commitlog/CommitLogSegmentManager.java
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/767cb9a6
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/767cb9a6
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/767cb9a6
Branch: refs/heads/cassandra-2.2
Commit: 767cb9a66be2ec8c55ff880890f49c3dbf69dbfa
Parents: ae179e4 8f70bb2
Author: Benedict Elliott Smith <[email protected]>
Authored: Tue Jul 28 17:36:25 2015 +0100
Committer: Benedict Elliott Smith <[email protected]>
Committed: Tue Jul 28 17:36:25 2015 +0100
----------------------------------------------------------------------
----------------------------------------------------------------------
