Commit 01d5b6c3 authored by Tim Peters's avatar Tim Peters

Merge rev 27621 from 3.3 branch.

Check in stuff mistakenly committed from the Zope trunk.

Rev 26842 changed cache-size parameters to type byte-size.
That's a good change, but it was checked in from a wrong place
(from the Zope trunk's copy of ZODB).  Since we want Zope 2.8 to
be usable with ZODB 3.3 too, I need to slam this change into
3.3 now.

Alas, I don't understand how ZODB+ZEO got stitched into the
Zope trunk (I do understand how it got stitched into the
Zope3 trunk, and into the X3 branch), and it looks like that
was left in a poor state.
parent 7135a68c
...@@ -18,7 +18,12 @@ What's new in ZODB3 3.3? ...@@ -18,7 +18,12 @@ What's new in ZODB3 3.3?
======================== ========================
Release date: 17-Sep-2004 Release date: 17-Sep-2004
Nothing changed since the 3.3c1 release, except for adding a new test. ZODB/component.xml
------------------
``cache-size`` parameters were changed from type ``integer`` to
type ``byte-size``. This allows you to specify, for example,
"``cache-size 20MB``" to get a 20 megabyte cache.
What's new in ZODB3 3.3 release candidate 1? What's new in ZODB3 3.3 release candidate 1?
......
...@@ -73,9 +73,9 @@ ...@@ -73,9 +73,9 @@
which is also the default name for the ZEO server. which is also the default name for the ZEO server.
</description> </description>
</key> </key>
<key name="cache-size" datatype="integer" default="20000000"> <key name="cache-size" datatype="byte-size" default="20MB">
<description> <description>
The maximum size of the client cache, in bytes. The maximum size of the client cache, in bytes, KB or MB.
</description> </description>
</key> </key>
<key name="name" default=""> <key name="name" default="">
...@@ -152,7 +152,7 @@ ...@@ -152,7 +152,7 @@
<sectiontype name="zodb" datatype=".ZODBDatabase" <sectiontype name="zodb" datatype=".ZODBDatabase"
implements="ZODB.database"> implements="ZODB.database">
<section type="ZODB.storage" name="*" attribute="storage"/> <section type="ZODB.storage" name="*" attribute="storage"/>
<key name="cache-size" datatype="integer" default="5000"/> <key name="cache-size" datatype="byte-size" default="5000"/>
<key name="pool-size" datatype="integer" default="7"/> <key name="pool-size" datatype="integer" default="7"/>
<key name="version-pool-size" datatype="integer" default="3"/> <key name="version-pool-size" datatype="integer" default="3"/>
<key name="version-cache-size" datatype="integer" default="100"/> <key name="version-cache-size" datatype="integer" default="100"/>
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment