git://git.onelab.eu
/
monitor.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
merge from improvements on the 1.0 branch:
[monitor.git]
/
siteinfo.py
diff --git
a/siteinfo.py
b/siteinfo.py
index
609cde2
..
cfce458
100755
(executable)
--- a/
siteinfo.py
+++ b/
siteinfo.py
@@
-4,10
+4,10
@@
from monitor.wrapper import plc
api = plc.getAuthAPI()
from monitor import database
api = plc.getAuthAPI()
from monitor import database
-from
monitor.pcu
import reboot
+from
pcucontrol
import reboot
import time
import time
-from
node
common import *
+from
monitor.
common import *
from monitor import util
from monitor import parser as parsermodule
from monitor import util
from monitor import parser as parsermodule