[Checkins] [zopefoundation/Zope] 07e20d: Add a flag for suppressing object events during fi...

[Jens Vagelpohl]

  Branch: refs/heads/issue_591
  Home:   https://github.com/zopefoundation/Zope
  Commit: 07e20d235fda0e8555c24cbb424574e9a69241a2
      https://github.com/zopefoundation/Zope/commit/07e20d235fda0e8555c24cbb424574e9a69241a2
  Author: Jens Vagelpohl <jens at mineralware.com>
  Date:   2019-05-09 (Thu, 09 May 2019)

  Changed paths:
    M CHANGES.rst
    M src/OFS/ObjectManager.py
    M src/OFS/dtml/importExport.dtml

  Log Message:
  -----------
  Add a flag for suppressing object events during file import (#599)

* - reformat HTML to make it easier to work with [ci skip]

* - Add a flag for suppressing object events during file import


  Commit: fdf97087ad55e6f98c2c74980ff4453f6b459603
      https://github.com/zopefoundation/Zope/commit/fdf97087ad55e6f98c2c74980ff4453f6b459603
  Author: Jens Vagelpohl <jens at dataflake.org>
  Date:   2019-05-09 (Thu, 09 May 2019)

  Changed paths:
    M CHANGES.rst
    M docs/INSTALL.rst
    M docs/operation.rst
    M docs/zope4/migration/zodb.rst
    M docs/zopebook/AdvZPT.rst
    M src/Products/PageTemplates/unicodeconflictresolver.py
    M src/Zope2/Startup/tests/test_schema.py
    M src/Zope2/utilities/finder.py
    R src/Zope2/utilities/skel/etc/wsgi.conf.in
    A src/Zope2/utilities/skel/etc/zope.conf.in
    M src/Zope2/utilities/skel/etc/zope.ini.in

  Log Message:
  -----------
  Change generated WSGI confinguation names (#597)

* - change generated WSGI config names to zope.conf and zopewsgi.ini

* - correct docstring

* - change WSGI ini file name to zope.ini


  Commit: 151cea2344943004320cd482f12b3e2e5847d34f
      https://github.com/zopefoundation/Zope/commit/151cea2344943004320cd482f12b3e2e5847d34f
  Author: Jens Vagelpohl <jens at dataflake.org>
  Date:   2019-05-09 (Thu, 09 May 2019)

  Changed paths:
    M CHANGES.rst
    M docs/INSTALL.rst
    M docs/operation.rst
    M docs/zope4/migration/zodb.rst
    M docs/zopebook/AdvZPT.rst
    M src/OFS/ObjectManager.py
    M src/OFS/dtml/importExport.dtml
    M src/Products/PageTemplates/unicodeconflictresolver.py
    M src/Zope2/Startup/tests/test_schema.py
    M src/Zope2/utilities/finder.py
    R src/Zope2/utilities/skel/etc/wsgi.conf.in
    A src/Zope2/utilities/skel/etc/zope.conf.in
    M src/Zope2/utilities/skel/etc/zope.ini.in

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


Compare: https://github.com/zopefoundation/Zope/compare/52f80028b2ad...151cea234494