diff --git a/last_commit.txt b/last_commit.txt index 3f439ecc9f..27a4b3490a 100644 --- a/last_commit.txt +++ b/last_commit.txt @@ -1,32 +1,17 @@ -Repository: plone.app.querystring +Repository: plone.app.upgrade Branch: refs/heads/master -Date: 2023-09-21T08:32:35-07:00 -Author: David Glick (davisagli) -Commit: https://github.com/plone/plone.app.querystring/commit/dd18ce0e2920f5010990de34c3e7374ef094aad9 +Date: 2023-09-21T20:18:00+02:00 +Author: Maurits van Rees (mauritsvanrees) +Commit: https://github.com/plone/plone.app.upgrade/commit/6ac8343b9fe9505c0b62d2375b494f9eb8bd1d4d -Preparing release 2.1.0 +Added upgrade to 6019, Plone 6.0.8. Files changed: +A news/6019.bugfix M CHANGES.rst -M setup.py -D news/137.feature +M plone/app/upgrade/v60/configure.zcml -b'diff --git a/CHANGES.rst b/CHANGES.rst\nindex 90c69bf..00d0dab 100644\n--- a/CHANGES.rst\n+++ b/CHANGES.rst\n@@ -8,6 +8,15 @@ Changelog\n \n .. towncrier release notes start\n \n+2.1.0 (2023-09-21)\n+------------------\n+\n+New features:\n+\n+\n+- Add a way to specific a context for getting vocabularies in the QuerystringRegistryReader. @davisagli (#137)\n+\n+\n 2.0.6 (2023-08-17)\n ------------------\n \ndiff --git a/news/137.feature b/news/137.feature\ndeleted file mode 100644\nindex 17bac84..0000000\n--- a/news/137.feature\n+++ /dev/null\n@@ -1 +0,0 @@\n-Add a way to specific a context for getting vocabularies in the QuerystringRegistryReader. @davisagli\ndiff --git a/setup.py b/setup.py\nindex 258b709..629b54c 100644\n--- a/setup.py\n+++ b/setup.py\n@@ -2,7 +2,7 @@\n from setuptools import setup\n \n \n-version = "2.0.7.dev0"\n+version = "2.1.0"\n \n long_description = open("README.rst").read() + "\\n"\n long_description += open("CHANGES.rst").read()\n' - -Repository: plone.app.querystring - - -Branch: refs/heads/master -Date: 2023-09-21T08:34:34-07:00 -Author: David Glick (davisagli) -Commit: https://github.com/plone/plone.app.querystring/commit/68d49d966f86966a6109c4f90e71cc2841f1f1e6 - -Back to development: 2.1.1 - -Files changed: -M setup.py - -b'diff --git a/setup.py b/setup.py\nindex 629b54c..4a42497 100644\n--- a/setup.py\n+++ b/setup.py\n@@ -2,7 +2,7 @@\n from setuptools import setup\n \n \n-version = "2.1.0"\n+version = "2.1.1.dev0"\n \n long_description = open("README.rst").read() + "\\n"\n long_description += open("CHANGES.rst").read()\n' +b'diff --git a/CHANGES.rst b/CHANGES.rst\nindex d909bdd9..5b33f69e 100644\n--- a/CHANGES.rst\n+++ b/CHANGES.rst\n@@ -145,7 +145,7 @@ Bug fixes:\n Bug fixes:\n \n \n-- Add migration of actions.xml for https://github.com/plone/Products.CMFPlone/pull/3616 \n+- Add migration of actions.xml for https://github.com/plone/Products.CMFPlone/pull/3616\n Add infrastructure for to beta2 migrations.\n [jensens] (#294)\n - Add a timezone property to portal memberdata if it is missing. (#295)\ndiff --git a/news/6019.bugfix b/news/6019.bugfix\nnew file mode 100644\nindex 00000000..f018803f\n--- /dev/null\n+++ b/news/6019.bugfix\n@@ -0,0 +1,2 @@\n+Added upgrade to 6019, Plone 6.0.8.\n+[maurits]\ndiff --git a/plone/app/upgrade/v60/configure.zcml b/plone/app/upgrade/v60/configure.zcml\nindex 57b7b12a..4cae0915 100644\n--- a/plone/app/upgrade/v60/configure.zcml\n+++ b/plone/app/upgrade/v60/configure.zcml\n@@ -317,4 +317,18 @@\n \n \n \n+ \n+ \n+\n+ \n+\n+ \n+\n \n'