merged changesets 11047 and 11050 from trunk

[nodeconfig.git] / nodeconfig.spec

diff --git a/nodeconfig.spec b/nodeconfig.spec
index 9590b8e..097b35a 100644 (file)
--- a/nodeconfig.spec
+++ b/nodeconfig.spec
@@ -5,7 +5,7 @@
 
 %define name nodeconfig
 %define version 4.2
-%define taglevel 8
+%define taglevel 13
 
 %define release %{taglevel}%{?pldistro:.%{pldistro}}%{?date:.%{date}}
 
@@ -67,6 +67,23 @@ rm -rf $RPM_BUILD_ROOT
 /var/www/html/PLCAPI
 
 %changelog
+* Fri Sep 19 2008 Faiyaz Ahmed <faiyaza@cs.princeton.edu> - nodeconfig-4.2-13
+- This configuration file has a single line addition to the standard configuration and it's based on state maintained in the DB.  This has been deprecated in favor of maintaining it in NM.  The standard configuration is in the iptables module and the nodegroup specific addition is created when the ipset is created by NM.
+
+* Mon Sep 15 2008 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - nodeconfig-4.2-12
+- yum config for nodes needs to mention the additional 'newkey' repository
+
+* Mon Aug 04 2008 Sapan Bhatia <sapanb@cs.princeton.edu> - nodeconfig-4.2-11
+- PlanetFlow/codemux fix
+- Used "./module-tag -b 4.2 nodeconfig:4.2".
+
+* Fri Jul 25 2008 Faiyaz Ahmed <faiyaza@cs.princeton.edu> - nodeconfig-4.2-10
+- syntax error. Fixed.
+
+* Fri Jul 25 2008 Faiyaz Ahmed <faiyaza@cs.princeton.edu> - nodeconfig-4.2-9
+- Updated ntp conf files.
+- I2 iptables for nodes on I2.
+
 * Thu Jul 24 2008 Faiyaz Ahmed <faiyaza@cs.princeton.edu> - nodeconfig-4.2-8
 - iptables superceded by svn/iptables/planetlab-config