Merge branch 'cassandra-2.1' into cassandra-2.2
Conflicts:
CHANGES.txt
NEWS.txt
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/0ba915d9
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0ba915d9
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/0ba915d9
Branch: refs/heads/trunk
Commit: 0ba915d930255ddf430785c0b3deee80d86dba39
Parents: 767cb9a 94c826e
Author: Benedict Elliott Smith <[email protected]>
Authored: Tue Jul 28 18:05:51 2015 +0100
Committer: Benedict Elliott Smith <[email protected]>
Committed: Tue Jul 28 18:05:51 2015 +0100
----------------------------------------------------------------------
----------------------------------------------------------------------
