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
svn merge -r 12308:13112 https://svn.planet-lab.org/svn/Monitor/branches/2.0/
[monitor.git]
/
nodeconfig.py
diff --git
a/nodeconfig.py
b/nodeconfig.py
index
401ff83
..
788d7f8
100755
(executable)
--- a/
nodeconfig.py
+++ b/
nodeconfig.py
@@
-8,8
+8,7
@@
from monitor import parser as parsermodule
from sets import Set
from monitor.common import *
from sets import Set
from monitor.common import *
-from monitor import database
-from monitor.database import FindbadNodeRecord
+from monitor.database.info.model import FindbadNodeRecord
def network_config_to_str(net):
def network_config_to_str(net):