Skip to content

Commit

Permalink
[fc] Repository: plone.recipe.zope2instance
Browse files Browse the repository at this point in the history 
Branch: refs/heads/master
Date: 2019-09-06T12:42:20+02:00
Author: Andreas Jung (zopyx) <info@zopyx.com>
Commit: plone/plone.recipe.zope2instance@b95286f

removed leading dash

Files changed:
M news/119-1.feature
M news/119-2.feature
M news/119-3.feature
Repository: plone.recipe.zope2instance

Branch: refs/heads/master
Date: 2019-09-09T10:28:29+02:00
Author: Jens W. Klein (jensens) <jk@kleinundpartner.at>
Commit: plone/plone.recipe.zope2instance@1d9ca20

Merge pull request #128 from plone/fix-119-news

fix news files

Files changed:
M news/119-1.feature
M news/119-2.feature
M news/119-3.feature
  • Loading branch information
@jensens
jensens committed Sep 9, 2019
1 parent b91a434 commit de1fdd0
Showing 1 changed file with 16 additions and 44 deletions.
60 changes: 16 additions & 44 deletions last_commit.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,63 +2,35 @@ Repository: plone.recipe.zope2instance


Branch: refs/heads/master
Date: 2019-09-05T07:40:17+02:00
Author: tschorr (tschorr) <t_schorr@gmx.de>
Commit: https://github.com/plone/plone.recipe.zope2instance/commit/dcdb11a879370fbe15422f1451bfce9d5119f95f
Date: 2019-09-06T12:42:20+02:00
Author: Andreas Jung (zopyx) <info@zopyx.com>
Commit: https://github.com/plone/plone.recipe.zope2instance/commit/b95286f73bf4177dd8b4fd997c335062baaa162e

document threads option
removed leading dash

Files changed:
M README.rst
M news/119-1.feature
M news/119-2.feature
M news/119-3.feature

b"diff --git a/README.rst b/README.rst\nindex 83d87be..6b8addd 100644\n--- a/README.rst\n+++ b/README.rst\n@@ -57,11 +57,16 @@ ip-address\n overridden on a per-server basis in the servers section. Defaults to not\n setting an ip-address. Used for ZServer only, not WSGI.\n \n+threads\n+ Specify the number of worker threads used to service requests.\n+ The default is 4 for WSGI (since this is the waitress default) and 2 for ZServer.\n+\n zodb-cache-size\n Set the ZODB cache size, i.e. the number of objects which the ZODB cache\n will try to hold. Defaults to 30000.\n \n zserver-threads\n+ Deprecated, use `threads` instead.\n Specify the number of threads that Zope's ZServer web server will use to\n service requests. The recipes default is 2. Used for ZServer only, not WSGI.\n \n"
b'diff --git a/news/119-1.feature b/news/119-1.feature\nindex 5b0db8d..f60866a 100644\n--- a/news/119-1.feature\n+++ b/news/119-1.feature\n@@ -1 +1 @@\n-- added `wsgi-ini-template` option for specifying a custom template for the generation of the `wsgi.ini` configuration file [ajung]\n+added `wsgi-ini-template` option for specifying a custom template for the generation of the `wsgi.ini` configuration file [ajung]\ndiff --git a/news/119-2.feature b/news/119-2.feature\nindex 4708751..3cf768d 100644\n--- a/news/119-2.feature\n+++ b/news/119-2.feature\n@@ -1 +1 @@\n-- advanced WSGI logging configuration options for specifying arbitrary logging handlers for event and access log [ajung]\n+advanced WSGI logging configuration options for specifying arbitrary logging handlers for event and access log [ajung]\ndiff --git a/news/119-3.feature b/news/119-3.feature\nindex 478dd43..41df22a 100644\n--- a/news/119-3.feature\n+++ b/news/119-3.feature\n@@ -1 +1 @@\n-- added documentation and examples for advanced WSGI logger configuration [ajung]\n+added documentation and examples for advanced WSGI logger configuration [ajung]\n'

Repository: plone.recipe.zope2instance


Branch: refs/heads/master
Date: 2019-09-05T07:59:54+02:00
Author: tschorr (tschorr) <t_schorr@gmx.de>
Commit: https://github.com/plone/plone.recipe.zope2instance/commit/da0973e65f8b1aa99a64b6b7a135497bc1fc1b84

add changelog entry

Files changed:
A news/126.bugfix

b'diff --git a/news/126.bugfix b/news/126.bugfix\nnew file mode 100644\nindex 0000000..948bb32\n--- /dev/null\n+++ b/news/126.bugfix\n@@ -0,0 +1 @@\n+Add documentation for `threads` option.\n'

Repository: plone.recipe.zope2instance


Branch: refs/heads/master
Date: 2019-09-06T10:40:53+02:00
Author: tschorr (tschorr) <t_schorr@gmx.de>
Commit: https://github.com/plone/plone.recipe.zope2instance/commit/8b387a95cef792da96a80c3d154b15dff687338e

rename news file

Files changed:
A news/126.doc
D news/126.bugfix

b'diff --git a/news/126.bugfix b/news/126.doc\nsimilarity index 100%\nrename from news/126.bugfix\nrename to news/126.doc\n'

Repository: plone.recipe.zope2instance


Branch: refs/heads/master
Date: 2019-09-09T10:27:56+02:00
Date: 2019-09-09T10:28:29+02:00
Author: Jens W. Klein (jensens) <jk@kleinundpartner.at>
Commit: https://github.com/plone/plone.recipe.zope2instance/commit/ac05a4575e2ddaf95822deddaeec7d41843fb0cb
Commit: https://github.com/plone/plone.recipe.zope2instance/commit/1d9ca20b76d1fcdfdc5c0e1632ce62276fb6ed48

Merge pull request #126 from plone/document_threads_option
Merge pull request #128 from plone/fix-119-news

Document 'threads' option
fix news files

Files changed:
A news/126.doc
M README.rst
M news/119-1.feature
M news/119-2.feature
M news/119-3.feature

b"diff --git a/README.rst b/README.rst\nindex 71063a2..0c7a5f3 100644\n--- a/README.rst\n+++ b/README.rst\n@@ -57,11 +57,16 @@ ip-address\n overridden on a per-server basis in the servers section. Defaults to not\n setting an ip-address. Used for ZServer only, not WSGI.\n \n+threads\n+ Specify the number of worker threads used to service requests.\n+ The default is 4 for WSGI (since this is the waitress default) and 2 for ZServer.\n+\n zodb-cache-size\n Set the ZODB cache size, i.e. the number of objects which the ZODB cache\n will try to hold. Defaults to 30000.\n \n zserver-threads\n+ Deprecated, use `threads` instead.\n Specify the number of threads that Zope's ZServer web server will use to\n service requests. The recipes default is 2. Used for ZServer only, not WSGI.\n \ndiff --git a/news/126.doc b/news/126.doc\nnew file mode 100644\nindex 0000000..948bb32\n--- /dev/null\n+++ b/news/126.doc\n@@ -0,0 +1 @@\n+Add documentation for `threads` option.\n"
b'diff --git a/news/119-1.feature b/news/119-1.feature\nindex 5b0db8d..f60866a 100644\n--- a/news/119-1.feature\n+++ b/news/119-1.feature\n@@ -1 +1 @@\n-- added `wsgi-ini-template` option for specifying a custom template for the generation of the `wsgi.ini` configuration file [ajung]\n+added `wsgi-ini-template` option for specifying a custom template for the generation of the `wsgi.ini` configuration file [ajung]\ndiff --git a/news/119-2.feature b/news/119-2.feature\nindex 4708751..3cf768d 100644\n--- a/news/119-2.feature\n+++ b/news/119-2.feature\n@@ -1 +1 @@\n-- advanced WSGI logging configuration options for specifying arbitrary logging handlers for event and access log [ajung]\n+advanced WSGI logging configuration options for specifying arbitrary logging handlers for event and access log [ajung]\ndiff --git a/news/119-3.feature b/news/119-3.feature\nindex 478dd43..41df22a 100644\n--- a/news/119-3.feature\n+++ b/news/119-3.feature\n@@ -1 +1 @@\n-- added documentation and examples for advanced WSGI logger configuration [ajung]\n+added documentation and examples for advanced WSGI logger configuration [ajung]\n'

0 comments on commit de1fdd0

Please sign in to comment.