From: Sandrine Avakian <sandrine.avakian@inria.fr>
Date: Thu, 1 Dec 2011 14:52:32 +0000 (+0100)
Subject: Merge branch 'master' into senslab2
X-Git-Tag: sfa-2.1-24~3^2~262
X-Git-Url: http://git.onelab.eu/?p=sfa.git;a=commitdiff_plain;h=d58bbc6238ee07a3e386b2627aa64ccb2dce352f

Merge branch 'master' into senslab2
---

d58bbc6238ee07a3e386b2627aa64ccb2dce352f
diff --cc sfa/methods/ListResources.py
index 522c131d,328ddb2c..386b7f2f
--- a/sfa/methods/ListResources.py
+++ b/sfa/methods/ListResources.py
@@@ -1,10 -1,12 +1,12 @@@
  import zlib
 -
 +import sys
  from sfa.util.xrn import urn_to_hrn
  from sfa.util.method import Method
- from sfa.util.parameter import Parameter, Mixed
- from sfa.trust.credential import Credential
  from sfa.util.sfatablesRuntime import run_sfatables
+ from sfa.util.faults import SfaInvalidArgument
+ from sfa.trust.credential import Credential
+ 
+ from sfa.storage.parameter import Parameter, Mixed
  
  class ListResources(Method):
      """