[Zodb-checkins] CVS: ZODB4/src/zdaemon - schema.xml:1.2 sample.conf:1.2

[Jeremy Hylton]

Update of /cvs-repository/ZODB4/src/zdaemon
In directory cvs.zope.org:/tmp/cvs-serv15960/src/zdaemon

Modified Files:
	schema.xml sample.conf 
Log Message:
Merge ZODB3-2-merge branch to the head.

This completes the porting of bug fixes and random improvements from
ZODB 3.2 to ZODB 4.


=== ZODB4/src/zdaemon/schema.xml 1.1 => 1.2 ===
--- ZODB4/src/zdaemon/schema.xml:1.1	Thu Jun 19 11:44:34 2003
+++ ZODB4/src/zdaemon/schema.xml	Thu Jun 19 17:41:11 2003
@@ -240,6 +240,4 @@
 
   <section name="*" type="runner" attribute="runner" required="yes" />
 
-  <section name="*" type="eventlog" attribute="eventlog" required="no" />
-
 </schema>


=== ZODB4/src/zdaemon/sample.conf 1.1 => 1.2 ===
--- ZODB4/src/zdaemon/sample.conf:1.1	Thu Jun 19 11:44:34 2003
+++ ZODB4/src/zdaemon/sample.conf	Thu Jun 19 17:41:11 2003
@@ -14,10 +14,3 @@
   default-to-interactive True
   hang-around   False
 </runner>
-
-<eventlog>
-  level info
-  <logfile>
-    path /tmp/zdrun.log
-  </logfile>
-</eventlog>