From: Sandrine Avakian <sandrine.avakian@inria.fr>
Date: Mon, 16 Jan 2012 14:17:48 +0000 (+0100)
Subject: Merge branch 'master' into senslab2
X-Git-Tag: sfa-2.1-24~3^2~236
X-Git-Url: http://git.onelab.eu/?p=sfa.git;a=commitdiff_plain;h=013d9db0fd63345c1d24b2b15b59d3dc5036bc18

Merge branch 'master' into senslab2

Conflicts:
	sfa/managers/registry_manager.py
---

013d9db0fd63345c1d24b2b15b59d3dc5036bc18
diff --cc sfa/plc/plslices.py
index 4a88e224,9413e814..2937d72a
--- a/sfa/plc/plslices.py
+++ b/sfa/plc/plslices.py
@@@ -1,7 -1,7 +1,8 @@@
  from types import StringTypes
  from collections import defaultdict
 +import sys
  
+ from sfa.util.sfatime import utcparse, datetime_to_epoch
  from sfa.util.sfalogging import logger
  from sfa.util.xrn import Xrn, get_leaf, get_authority, urn_to_hrn
  #from sfa.util.policy import Policy