From: Sapan Bhatia <sapanb@cs.princeton.edu>
Date: Tue, 7 Jul 2009 20:39:01 +0000 (+0000)
Subject: Merging some recent changes
X-Git-Tag: sfa-0.9-0@14641~124
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=4bff9f65313cfb3149663a3805191e37795254b8;p=sfa.git

Merging some recent changes
---

diff --git a/sfa/util/newgeniclient.py b/sfa/util/newgeniclient.py
index b05947e8..fe2935ad 100644
--- a/sfa/util/newgeniclient.py
+++ b/sfa/util/newgeniclient.py
@@ -10,7 +10,7 @@
 from sfa.trust.gid import *
 from sfa.trust.credential import *
 from sfa.util.record import *
-from sfa.util.geniticket import *
+from sfa.util.sfaticket import *
 
 ##
 # The GeniClient class provides stubs for executing Geni operations. A given
@@ -318,7 +318,7 @@ class GeniClient:
 
     def get_ticket(self, cred, name, rspec):
         ticket_str = self.server.get_ticket(cred.save_to_string(save_parents=True), name, rspec)
-        ticket = Ticket(string=ticket_str)
+        ticket = SfaTicket(string=ticket_str)
         return ticket
 
     ##