[Zodb-checkins] SVN: ZODB/trunk/ Merge rev 27621 from 3.3 branch.

[Tim Peters]

Log message for revision 27622:
  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.
  


Changed:
  U   ZODB/trunk/NEWS.txt
  U   ZODB/trunk/src/ZODB/component.xml


-=-
Modified: ZODB/trunk/NEWS.txt
===================================================================
--- ZODB/trunk/NEWS.txt	2004-09-17 19:21:36 UTC (rev 27621)
+++ ZODB/trunk/NEWS.txt	2004-09-17 19:24:18 UTC (rev 27622)
@@ -18,9 +18,14 @@
 ========================
 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?
 ============================================
 Release date: 14-Sep-2004

Modified: ZODB/trunk/src/ZODB/component.xml
===================================================================
--- ZODB/trunk/src/ZODB/component.xml	2004-09-17 19:21:36 UTC (rev 27621)
+++ ZODB/trunk/src/ZODB/component.xml	2004-09-17 19:24:18 UTC (rev 27622)
@@ -73,9 +73,9 @@
         which is also the default name for the ZEO server.
       </description>
     </key>
-    <key name="cache-size" datatype="integer" default="20000000">
+    <key name="cache-size" datatype="byte-size" default="20MB">
       <description>
-        The maximum size of the client cache, in bytes.
+        The maximum size of the client cache, in bytes, KB or MB.
       </description>
     </key>
     <key name="name" default="">
@@ -152,7 +152,7 @@
   <sectiontype name="zodb" datatype=".ZODBDatabase"
                implements="ZODB.database">
     <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="version-pool-size" datatype="integer" default="3"/>
     <key name="version-cache-size" datatype="integer" default="100"/>