Skip to content

Commit

Permalink
Merge branch 'master' into instification/theme-editor-bugfix
Browse files Browse the repository at this point in the history
  • Loading branch information
instification committed Sep 8, 2017
2 parents 18c692f + f1e1b20 commit d43372f
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 2 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,6 @@ script:
- bin/code-analysis
- bin/test
after_success:
- bin/createcoverage
- bin/createcoverage -d .
- python -m coverage.pickle2json
- coveralls
2 changes: 2 additions & 0 deletions CHANGES.rst
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ Changelog
2.0a8 (unreleased)
------------------

- Fix to failing travis tests, ``bin/createcoverage`` tries to open browser.
[instification]
- Stripped query string before testing which urls to strip cookies on.
https://github.com/collective/plone.recipe.varnish/issues/42 [instification]

Expand Down
3 changes: 2 additions & 1 deletion README.rst
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
.. image:: https://travis-ci.org/collective/plone.recipe.varnish.svg?branch=master
:target: https://travis-ci.org/collective/plone.recipe.varnish

.. image:: https://coveralls.io/repos/collective/plone.recipe.varnish/badge.svg?branch=master&service=github
.. image:: https://coveralls.io/repos/github/collective/plone.recipe.varnish/badge.svg?branch=master
:target: https://coveralls.io/github/collective/plone.recipe.varnish?branch=master


Varnish recipe for buildout
===========================

Expand Down

0 comments on commit d43372f

Please sign in to comment.