[Checkins] [zopefoundation/Zope] fe57ad: - Make sure conflicts are always retried and not m...

[Jens Vagelpohl]

  Branch: refs/heads/issue_413
  Home:   https://github.com/zopefoundation/Zope
  Commit: fe57ad1bb2c92e0849fec4c59b2478b4c394a91b
      https://github.com/zopefoundation/Zope/commit/fe57ad1bb2c92e0849fec4c59b2478b4c394a91b
  Author: Jens Vagelpohl <jens at netz.ooo>
  Date:   2019-02-07 (Thu, 07 Feb 2019)

  Changed paths:
    M CHANGES.rst
    M src/ZPublisher/WSGIPublisher.py
    M src/ZPublisher/tests/test_WSGIPublisher.py

  Log Message:
  -----------
  - Make sure conflicts are always retried and not masked by exception views


  Commit: 768f5fae3a730d95358df4531e9b81db383f3bcc
      https://github.com/zopefoundation/Zope/commit/768f5fae3a730d95358df4531e9b81db383f3bcc
  Author: Jens Vagelpohl <jens at netz.ooo>
  Date:   2019-02-08 (Fri, 08 Feb 2019)

  Changed paths:
    M src/ZPublisher/tests/test_WSGIPublisher.py

  Log Message:
  -----------
  - register test exception view for more generic exception


  Commit: c2574169ae01b4282ced710af26eab768bf9bee8
      https://github.com/zopefoundation/Zope/commit/c2574169ae01b4282ced710af26eab768bf9bee8
  Author: Jens Vagelpohl <jens at netz.ooo>
  Date:   2019-02-08 (Fri, 08 Feb 2019)

  Changed paths:
    M .travis.yml
    M MANIFEST.in

  Log Message:
  -----------
  Merge branch 'master' into issue_413


  Commit: 5e244e84946cbbd69405889dd5a46e4bc831c271
      https://github.com/zopefoundation/Zope/commit/5e244e84946cbbd69405889dd5a46e4bc831c271
  Author: Jens Vagelpohl <jens at netz.ooo>
  Date:   2019-02-10 (Sun, 10 Feb 2019)

  Changed paths:
    M src/App/dtml/manage_navbar.dtml
    M src/OFS/DTMLMethod.py

  Log Message:
  -----------
  - apply simpler fix


Compare: https://github.com/zopefoundation/Zope/compare/fe57ad1bb2c9%5E...5e244e84946c