[Zodb-checkins] CVS: Zope/lib/python/ZEO - ClientStorage.py:1.112 monitor.py:1.5

[Jim Fulton]

Update of /cvs-repository/Zope/lib/python/ZEO
In directory cvs.zope.org:/tmp/cvs-serv3783/lib/python/ZEO

Modified Files:
	ClientStorage.py monitor.py 
Log Message:
Merged Jeremy and Tim's changes from the zodb33-devel-branch.


=== Zope/lib/python/ZEO/ClientStorage.py 1.111 => 1.112 ===
--- Zope/lib/python/ZEO/ClientStorage.py:1.111	Fri Oct  3 16:27:32 2003
+++ Zope/lib/python/ZEO/ClientStorage.py	Fri Nov 28 11:44:47 2003
@@ -34,7 +34,7 @@
 from ZEO.zrpc.client import ConnectionManager
 
 from ZODB import POSException
-from ZODB.TimeStamp import TimeStamp
+from persistent.TimeStamp import TimeStamp
 from zLOG import LOG, PROBLEM, INFO, BLATHER, ERROR
 
 def log2(type, msg, subsys="ZCS:%d" % os.getpid()):


=== Zope/lib/python/ZEO/monitor.py 1.4 => 1.5 ===