X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=NodeManager.spec;h=2f99ffb01d6c406558824ce09df94af11ba0ded2;hb=refs%2Fheads%2F1.8;hp=d879d4d3df9b868ec6dfc38fab88bc765613cb8d;hpb=af7cf207d0aa87d2336442f0538c87d236bf31c5;p=nodemanager.git

diff --git a/NodeManager.spec b/NodeManager.spec
index d879d4d..2f99ffb 100644
--- a/NodeManager.spec
+++ b/NodeManager.spec
@@ -7,7 +7,7 @@
 
 %define name NodeManager
 %define version 1.8
-%define taglevel 38
+%define taglevel 39
 
 %define release %{taglevel}%{?pldistro:.%{pldistro}}%{?date:.%{date}}
 
@@ -114,6 +114,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_sysconfdir}/logrotate.d/nm
 
 %changelog
+* Wed May 02 2012 Andy Bavier <acb@cs.princeton.edu> - nodemanager-1.8-39
+- Merge changes to net.py from 2.0 branch
+
 * Tue Apr 05 2011 S.Çağlar Onur <caglar@verivue.com> - nodemanager-1.8-38
 - Add a logrotate entry for /var/log/nodemanager.daemon, which can get
 - out-of-hand on some nodes filling up the root partition.