git://git.onelab.eu
/
nodemanager.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rename accounts into account for consistency
[nodemanager.git]
/
slivermanager.py
diff --git
a/slivermanager.py
b/slivermanager.py
index
383379e
..
565e05d
100644
(file)
--- a/
slivermanager.py
+++ b/
slivermanager.py
@@
-14,7
+14,7
@@
import time
import logger
import api, api_calls
import database
import logger
import api, api_calls
import database
-import account
s
+import account
import controller
import sliver_vs
import controller
import sliver_vs
@@
-208,8
+208,8
@@
def start():
for resname, default_amount in sliver_vs.DEFAULT_ALLOCATION.iteritems():
DEFAULT_ALLOCATION[resname]=default_amount
for resname, default_amount in sliver_vs.DEFAULT_ALLOCATION.iteritems():
DEFAULT_ALLOCATION[resname]=default_amount
- account
s
.register_class(sliver_vs.Sliver_VS)
- account
s
.register_class(controller.Controller)
+ account.register_class(sliver_vs.Sliver_VS)
+ account.register_class(controller.Controller)
database.start()
api_calls.deliver_ticket = deliver_ticket
api.start()
database.start()
api_calls.deliver_ticket = deliver_ticket
api.start()