Merge branch 'cassandra-2.2' into cassandra-3.0 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/48889d2b Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/48889d2b Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/48889d2b Branch: refs/heads/cassandra-3.0 Commit: 48889d2bdeb617d711625f46af5e6eb87b4c9397 Parents: 454268b 8959668 Author: Tyler Hobbs <tylerlho...@gmail.com> Authored: Tue Oct 13 11:25:10 2015 -0500 Committer: Tyler Hobbs <tylerlho...@gmail.com> Committed: Tue Oct 13 11:25:10 2015 -0500 ---------------------------------------------------------------------- ----------------------------------------------------------------------