Tagging module Mom - Mom-2.2-6

Update mop script to monitor relevant procs.  Update swapmon to avoid corner case when slice is being built.

diff --git a/onelab-tags-4.2.mk b/onelab-tags-4.2.mk
index 1baf3a6..3ab5364 100644 (file)
--- a/onelab-tags-4.2.mk
+++ b/onelab-tags-4.2.mk
@@ -21,7 +21,7 @@ CoDemux-SVNPATH                       := http://svn.planet-lab.org/svn/CoDemux/tags/CoDemux-0.1-12
 fprobe-ulog-SVNPATH            := http://svn.planet-lab.org/svn/fprobe-ulog/tags/fprobe-ulog-1.1.2-4
 pf2slice-SVNPATH                := http://svn.planet-lab.org/svn/pf2slice/tags/pf2slice-1.0-2
 Mom-SVNBRANCH                  := 2.2
-Mom-SVNPATH                    := http://svn.planet-lab.org/svn/Mom/tags/Mom-2.2-5
+Mom-SVNPATH                    := http://svn.planet-lab.org/svn/Mom/tags/Mom-2.2-6
 iptables-SVNPATH               := http://svn.planet-lab.org/svn/iptables/tags/iptables-1.3.8-6
 iproute2-SVNPATH               := http://svn.planet-lab.org/svn/iproute2/tags/iproute2-2.6.16-2
 vsys-SVNPATH                   := http://svn.planet-lab.org/svn/vsys/tags/vsys-0.7-18

diff --git a/planetlab-tags-4.2.mk b/planetlab-tags-4.2.mk
index 2b1ec6f..eafcaa3 100644 (file)
--- a/planetlab-tags-4.2.mk
+++ b/planetlab-tags-4.2.mk
@@ -15,7 +15,7 @@ CoDemux-SVNPATH                       := http://svn.planet-lab.org/svn/CoDemux/tags/CoDemux-0.1-12
 fprobe-ulog-SVNPATH            := http://svn.planet-lab.org/svn/fprobe-ulog/tags/fprobe-ulog-1.1.2-4
 pf2slice-SVNPATH                := http://svn.planet-lab.org/svn/pf2slice/tags/pf2slice-1.0-2
 Mom-SVNBRANCH                  := 2.2
-Mom-SVNPATH                    := http://svn.planet-lab.org/svn/Mom/tags/Mom-2.2-5
+Mom-SVNPATH                    := http://svn.planet-lab.org/svn/Mom/tags/Mom-2.2-6
 iptables-SVNPATH               := http://svn.planet-lab.org/svn/iptables/tags/iptables-1.3.8-6
 iproute2-SVNPATH               := http://svn.planet-lab.org/svn/iproute2/tags/iproute2-2.6.16-2
 vsys-SVNPATH                   := http://svn.planet-lab.org/svn/vsys/tags/vsys-0.7-18