Merge branch 'cassandra-2.1' into cassandra-2.2
Conflicts:
CHANGES.txt
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/1dc19a66
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1dc19a66
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1dc19a66
Branch: refs/heads/cassandra-2.2
Commit: 1dc19a666d1da7efd4f017e70bc275ca2897a711
Parents: 3238906 15293a7
Author: Tyler Hobbs <tylerlho...@gmail.com>
Authored: Tue Aug 25 12:47:32 2015 -0500
Committer: Tyler Hobbs <tylerlho...@gmail.com>
Committed: Tue Aug 25 12:47:32 2015 -0500
----------------------------------------------------------------------
----------------------------------------------------------------------
