Merge branch 'cassandra-3.11' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/393226de Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/393226de Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/393226de Branch: refs/heads/trunk Commit: 393226de62045b199140e1c3bea8d634272c0b3e Parents: e0f3770 ebdf771 Author: Marcus Eriksson <marc...@apache.org> Authored: Fri Apr 7 08:11:44 2017 +0200 Committer: Marcus Eriksson <marc...@apache.org> Committed: Fri Apr 7 08:11:44 2017 +0200 ---------------------------------------------------------------------- circle.yml | 19 ++++++++++--------- doc/source/development/testing.rst | 3 +++ 2 files changed, 13 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/393226de/doc/source/development/testing.rst ----------------------------------------------------------------------
