From: Thierry Parmentelat Date: Mon, 24 Mar 2014 09:14:23 +0000 (+0100) Subject: Merge branch 'master' of ssh://git.onelab.eu/git/nodemanager X-Git-Tag: nodemanager-5.2-11~1 X-Git-Url: http://git.onelab.eu/?p=nodemanager.git;a=commitdiff_plain;h=84a05478db5517dce8b725e59c856285e569c9b2 Merge branch 'master' of ssh://git.onelab.eu/git/nodemanager --- 84a05478db5517dce8b725e59c856285e569c9b2 diff --cc nodemanager-lib.spec index b7674b1,9cc2331..723588c --- a/nodemanager-lib.spec +++ b/nodemanager-lib.spec @@@ -137,9 -137,17 +137,17 @@@ rm -rf $RPM_BUILD_ROO %{initdir}/ %{_sysconfdir}/logrotate.d/nodemanager /var/lib/nodemanager/ -/bin/sshsh +%config(noreplace) /etc/sysconfig/nodemanager %changelog + * Fri Mar 21 2014 Thierry Parmentelat - nodemanager-5.2-10 + - comes with systemd native unit files on >= f18 + - user-provided initscript gets started through systemd in slivers >= f18 + - smarter to locate cgroups for various versions of libvirt + - nicer log format - and log program termination + - tweaks in codemux plugin + - bug fixes in libvirt driver, esp. for finding out if domain is running + * Wed Dec 11 2013 Thierry Parmentelat - nodemanager-5.2-9 - fixes in hostmap, and in interfaces - new vsys_sysctl