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

diff --git a/sfa/util/sfalogging.py b/sfa/util/sfalogging.py
old mode 100755 (executable)
new mode 100644 (file)
index 199066d..3ec0350
--- a/sfa/util/sfalogging.py
+++ b/sfa/util/sfalogging.py
@@ -79,6 +79,10 @@ class _SfaLogger:
         
     def warn(self, msg):
         self.logger.warn(msg)
+
+    # some code is using logger.warn(), some is using logger.warning()
+    def warning(self, msg):
+        self.logger.warning(msg)
    
     def error(self, msg):
         self.logger.error(msg)