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
Backporting latest changes for 2.6.27 to the 4.3 version of NM
[nodemanager.git]
/
conf_files.py
diff --git
a/conf_files.py
b/conf_files.py
index
94560d6
..
b3b65f8
100644
(file)
--- a/
conf_files.py
+++ b/
conf_files.py
@@
-86,7
+86,7
@@
class conf_files:
def start(options, config): pass
def start(options, config): pass
-def GetSlivers(data):
+def GetSlivers(data
, config = None, plc = None
):
logger.log("conf_files: Running.")
cf = conf_files()
cf.run_once(data)
logger.log("conf_files: Running.")
cf = conf_files()
cf.run_once(data)