Merge branch 'python3'

diff --git a/nodemanager.spec b/nodemanager.spec
index 9389423..4319cbb 100644 (file)
--- a/nodemanager.spec
+++ b/nodemanager.spec
@@ -210,12 +210,15 @@ nodemanager-vs provides the vserver code for the PlanetLab Node Manager.
 
 ##############################
 %changelog
-* Mon Jan 07 2019 Thierry <Parmentelat> - nodemanager-7.0-0
+* Mon Jan 07 2019 Thierry Parmentelat <thierry.parmentelat@inria.fr> - nodemanager-7.0-0
 - ported to python3
 - add a systemd dependency to network-online so the service won't start too early
 - only support systemd, removed init-oriented business
 - also removed debian-oriented business
 
+* Mon Jan 07 2019 Thierry Parmentelat <thierry.parmentelat@inria.fr> - nodemanager-5.2-20
+- simply make conf_files.py executable, so that bootmanager can be py2/py3 compliant
+
 * Sun Jul 10 2016 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - nodemanager-5.2-19
 - tweak to run against libvirt-python-1.3.3 under f24
 - fix by Thomas Dreibholz - misspelled ovs-ovsctl