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]
/
nodeinfo.py
diff --git
a/nodeinfo.py
b/nodeinfo.py
index
9968b4b
..
9afed5c
100755
(executable)
--- a/
nodeinfo.py
+++ b/
nodeinfo.py
@@
-8,12
+8,12
@@
from monitor import util
from monitor import parser as parsermodule
from monitor import database
from monitor import parser as parsermodule
from monitor import database
-from
monitor.pcu
import reboot
+from
pcucontrol
import reboot
import time
import time
-from model import *
-from
node
common import *
-
from unified_
model import node_end_record, PersistFlags
+from mo
nitor.mo
del import *
+from
monitor.
common import *
+
#from monitor.
model import node_end_record, PersistFlags
parser = parsermodule.getParser()
parser.set_defaults(node=None,
parser = parsermodule.getParser()
parser.set_defaults(node=None,