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

[Tim Peters]

Log message for revision 29708:
  Merge rev 29706 from 3.3 branch.
  
  Change default port # from 9999 to 8100, to match zope.conf
  (well, on Zope trunk anyway -- the ZEO client example appears
  to have gone missing from zope.conf on Zope3 trunk).
  

Changed:
  U   ZODB/trunk/NEWS.txt
  U   ZODB/trunk/src/ZEO/mkzeoinst.py

-=-
Modified: ZODB/trunk/NEWS.txt
===================================================================
--- ZODB/trunk/NEWS.txt	2005-03-28 20:45:15 UTC (rev 29707)
+++ ZODB/trunk/NEWS.txt	2005-03-28 20:48:53 UTC (rev 29708)
@@ -229,6 +229,12 @@
 and ``items()`` methods.  Appropriate changes were merged in from the
 ZODB4 BTrees interface file.
 
+Tools
+-----
+
+- ``mkzeoinst.py``'s default port number changed from to 9999 to 8100, to
+  match the example in Zope's ``zope.conf``.
+
 fsIndex
 -------
 

Modified: ZODB/trunk/src/ZEO/mkzeoinst.py
===================================================================
--- ZODB/trunk/src/ZEO/mkzeoinst.py	2005-03-28 20:45:15 UTC (rev 29707)
+++ ZODB/trunk/src/ZEO/mkzeoinst.py	2005-03-28 20:48:53 UTC (rev 29708)
@@ -159,8 +159,7 @@
         if args[1:]:
             port = int(args[1])
         else:
-            # XXX Change this to 8001, to make Zope's default (verify!).
-            port = 9999
+            port = 8100  # match example in zope.conf
 
         params = self.get_params(zodb3_home, instance_home, port)
         self.create(instance_home, params)