Merge branch 'cassandra-2.2' into cassandra-3.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/8d34076a Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8d34076a Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/8d34076a Branch: refs/heads/trunk Commit: 8d34076aac88a29d6d8a4f3050fdc7a75389298e Parents: a8a3d4e 1e102b4 Author: Marcus Eriksson <marc...@apache.org> Authored: Fri Apr 7 08:09:45 2017 +0200 Committer: Marcus Eriksson <marc...@apache.org> Committed: Fri Apr 7 08:09:45 2017 +0200 ---------------------------------------------------------------------- circle.yml | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) ----------------------------------------------------------------------
