Merge branch 'cassandra-2.1' into cassandra-2.2
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/269059e8 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/269059e8 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/269059e8 Branch: refs/heads/trunk Commit: 269059e8eb09bfa03bdd6ade9c33d91cc0cf5f3b Parents: 63e122c eb875b4 Author: T Jake Luciani <j...@apache.org> Authored: Mon Jul 6 11:20:44 2015 -0400 Committer: T Jake Luciani <j...@apache.org> Committed: Mon Jul 6 11:20:44 2015 -0400 ---------------------------------------------------------------------- ----------------------------------------------------------------------
