Merge branch 'master' of ssh://git.planet-lab.org/git/sfa

diff --git a/sfa/util/server.py b/sfa/util/server.py
index 34b5b2a..f8b1af4 100644 (file)
--- a/sfa/util/server.py
+++ b/sfa/util/server.py
@@ -175,6 +175,7 @@ class SecureXMLRPCServer(BaseHTTPServer.HTTPServer,SimpleXMLRPCServer.SimpleXMLR
             raise xmlrpclib.Fault(1,''.join(traceback.format_exception(type, value, tb)))
 
     # override this one from the python 2.7 code
+    # originally defined in class TCPServer
     def shutdown_request(self, request):
         """Called to shutdown and close an individual request."""
         # ----------