fix merge problem

[sfa.git] / sfa / methods / __init__.py

diff --git a/sfa/methods/__init__.py b/sfa/methods/__init__.py
index eef24de..8f35200 100644 (file)
--- a/sfa/methods/__init__.py
+++ b/sfa/methods/__init__.py
@@ -13,9 +13,7 @@ ListResources
 ListSlices
 RedeemTicket
 Register
-RegisterPeerObject
 Remove
-RemovePeerObject
 RenewSliver
 Resolve
 ResolveGENI
@@ -25,11 +23,7 @@ Start
 Stop
 Update
 UpdateSliver
-get_aggregates
-get_key
-get_registries
+get_key_from_incoming_ip
 get_trusted_certs
-register_peer_object
-remove_peer_object
 reset_slice
 """.split()