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/1e102b41 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1e102b41 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1e102b41 Branch: refs/heads/cassandra-3.0 Commit: 1e102b41e8ac03e1974a5eafacadc49809831f08 Parents: 377f611 b021a1b Author: Marcus Eriksson <marc...@apache.org> Authored: Fri Apr 7 08:09:09 2017 +0200 Committer: Marcus Eriksson <marc...@apache.org> Committed: Fri Apr 7 08:09:09 2017 +0200 ---------------------------------------------------------------------- circle.yml | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) ----------------------------------------------------------------------
