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/330d7d40 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/330d7d40 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/330d7d40 Branch: refs/heads/trunk Commit: 330d7d40be066973e9980ae9875e6efbe1ade362 Parents: bf40aa4 6e6bde8 Author: Carl Yeksigian <c...@apache.org> Authored: Mon May 16 16:45:21 2016 -0400 Committer: Carl Yeksigian <c...@apache.org> Committed: Mon May 16 16:45:21 2016 -0400 ---------------------------------------------------------------------- ----------------------------------------------------------------------
