X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=pl_mom.spec;h=bbebeaf46146b3bf6093d190076e266f69ea81fb;hb=8528ff7d5d53aa6e0b8c9f7b13712bd65199c248;hp=f98a708284f0af1dc1975b173c7db9e8ac646145;hpb=31ab00c1394854e4dd19b35cae7167e57b553a3d;p=mom.git

diff --git a/pl_mom.spec b/pl_mom.spec
index f98a708..bbebeaf 100644
--- a/pl_mom.spec
+++ b/pl_mom.spec
@@ -1,6 +1,6 @@
 %define name pl_mom
-%define version 0.4
-%define release 6%{?pldistro:.%{pldistro}}%{?date:.%{date}}
+%define version 0.6
+%define release 10%{?pldistro:.%{pldistro}}%{?date:.%{date}}
  
 Summary: PlanetLab node monitoring tools
 Name: %{name}
@@ -55,6 +55,9 @@ install -D -m 755 swapmon.init $RPM_BUILD_ROOT/%{_initrddir}/swapmon
 # Cleanup script
 install -D -m 755 pl_mop.sh $RPM_BUILD_ROOT/usr/local/planetlab/bin/pl_mop.sh
 
+# Tests and restarts NM
+install -D -m 755 nm_mom.py $RPM_BUILD_ROOT/%{_datadir}/%{name}/nm_mom.py
+
 # Runs pl_mop and bwmon periodically
 install -D -m 644 pl_mom.cron $RPM_BUILD_ROOT/%{_sysconfdir}/cron.d/pl_mom
 
@@ -97,6 +100,7 @@ exit 0
 %files
 %defattr(-, root, root, -)
 %{_datadir}/%{name}/pl_mom.py
+%{_datadir}/%{name}/nm_mom.py
 %{_datadir}/%{name}/bwmon.py
 %{_datadir}/%{name}/swapmon.py
 %{_initrddir}/swapmon
@@ -104,8 +108,19 @@ exit 0
 %{_sysconfdir}/cron.d/pl_mom
 
 %changelog
+* Wed Jul 19 2006 Faiyaz Ahmed <faiyaza@cs.princeton.edu> 0.4-7.planetlab
+- swapmon: Added state info so same reset email does not keep getting
+  sent. If slice is already being killed, will wait for a timeout
+  before trying to kill again.
+
+* Mon Jul 17 2006 Faiyaz Ahmed <faiyaza@cs.princeton.edu> 0.4-6.planetlab
+- swapmon: Added state information per slice.  Slices are now killed
+  after consuming more memory than the threshold more than twice.
+  Also fixed the slice restart issue where slices would be restarted
+  and repeated restart emails would be sent.
+
 * Mon Jul 10 2006 Faiyaz Ahmed <faiyaza@cs.princeton.edu> 0.4-5.planetlab
-- bwlimit: Initialize default limits
+- bwmon: Initialize default limits
 
 * Mon Jul 10 2006 Faiyaz Ahmed <faiyaza@cs.princeton.edu> 0.4-4.planetlab
-- bwlimit: Use cached values if NM stops responding
+- bwmon: Use cached values if NM stops responding