fix merge problem

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

diff --git a/sfa/methods/__init__.py b/sfa/methods/__init__.py
index 7908086..8f35200 100644 (file)
--- a/sfa/methods/__init__.py
+++ b/sfa/methods/__init__.py
@@ -1,40 +1,29 @@
 ## Please use make index to update this file
 all = """
-create_gid
-create_slice
-delete_slice
-get_aggregates
-get_credential
-get_gid
-get_gids
-get_key
-get_registries
-get_resources
-get_self_credential
-get_slices
-get_ticket
-get_trusted_certs
-list
-reboot
-redeem_ticket
-register
-register_peer_object
-remove
-reset_slice
-resolve
-start_slice
-stop_slice
-update
-remove_peer_object
-GetVersion
-ListResources
 CreateSliver
-get_geni_aggregates
+CreateGid
 DeleteSliver
-SliverStatus
+GetCredential
+GetGids
+GetSelfCredential
+GetTicket
+GetVersion
+List
+ListResources
+ListSlices
+RedeemTicket
+Register
+Remove
 RenewSliver
+Resolve
+ResolveGENI
+Shutdown
+SliverStatus
 Start
 Stop
-Shutdown
-ResolveGENI
+Update
+UpdateSliver
+get_key_from_incoming_ip
+get_trusted_certs
+reset_slice
 """.split()