From: Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Date: Fri, 19 Nov 2010 15:09:13 +0000 (+0100)
Subject: Merge branch 'master' of ssh://git.onelab.eu/git/myplc
X-Git-Tag: myplc-5.0-12~1
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=da17be59363ab433bb8f66f648c15fdaa184e014;hp=1dcddace203af7fcacaa7f5c917ad59a6327f7b8;p=myplc.git

Merge branch 'master' of ssh://git.onelab.eu/git/myplc
---

diff --git a/myplc-docs.spec b/myplc-docs.spec
index 7516692..5798248 100644
--- a/myplc-docs.spec
+++ b/myplc-docs.spec
@@ -5,7 +5,7 @@
 
 %define name myplc-docs
 %define version 5.0
-%define taglevel 9
+%define taglevel 11
 
 %define release %{taglevel}%{?pldistro:.%{pldistro}}%{?date:.%{date}}
 
@@ -93,6 +93,13 @@ rm -rf $RPM_BUILD_ROOT
 /var/www/html/planetlab/doc/
 
 %changelog
+* Mon Oct 04 2010 Baris Metin <Talip-Baris.Metin@sophia.inria.fr> - myplc-5.0-11
+- add missing files to rpm package
+
+* Mon Oct 04 2010 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - myplc-5.0-10
+- mtail.py -s for SFA
+- spot-aliesm.py is a utility script for sanity checks of the PLC db when running refreshpeer+sfa
+
 * Thu Jul 15 2010 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - myplc-5.0-9
 - avoid duplication of the plc-config binary in both myplc and myplc-config rpms
 
diff --git a/myplc-release.spec b/myplc-release.spec
index e91f5e0..4b14ecb 100644
--- a/myplc-release.spec
+++ b/myplc-release.spec
@@ -5,7 +5,7 @@
 
 %define name myplc-release
 %define version 5.0
-%define taglevel 9
+%define taglevel 11
 
 %define release %{taglevel}%{?pldistro:.%{pldistro}}%{?date:.%{date}}
 
@@ -57,6 +57,13 @@ rm -rf $RPM_BUILD_ROOT
 /etc/myplc-release
 
 %changelog
+* Mon Oct 04 2010 Baris Metin <Talip-Baris.Metin@sophia.inria.fr> - myplc-5.0-11
+- add missing files to rpm package
+
+* Mon Oct 04 2010 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - myplc-5.0-10
+- mtail.py -s for SFA
+- spot-aliesm.py is a utility script for sanity checks of the PLC db when running refreshpeer+sfa
+
 * Thu Jul 15 2010 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - myplc-5.0-9
 - avoid duplication of the plc-config binary in both myplc and myplc-config rpms
 
diff --git a/myplc.spec b/myplc.spec
index 6b8e649..63e3227 100644
--- a/myplc.spec
+++ b/myplc.spec
@@ -4,7 +4,7 @@
 
 %define name myplc
 %define version 5.0
-%define taglevel 9
+%define taglevel 11
 
 %define release %{taglevel}%{?pldistro:.%{pldistro}}%{?date:.%{date}}
 %global python_sitearch	%( python -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)" )
@@ -242,6 +242,8 @@ fi
 /usr/bin/clean-empty-dirs.py*
 /usr/bin/plc-check-ssl-peering.py*
 /usr/bin/plc-orphan-accounts.py*
+/usr/bin/spot-aliens.py*
+/usr/bin/spot-dup-accounts.sh
 
 %files config
 %defattr(-,root,root,-)
@@ -250,6 +252,13 @@ fi
 
 
 %changelog
+* Mon Oct 04 2010 Baris Metin <Talip-Baris.Metin@sophia.inria.fr> - myplc-5.0-11
+- add missing files to rpm package
+
+* Mon Oct 04 2010 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - myplc-5.0-10
+- mtail.py -s for SFA
+- spot-aliesm.py is a utility script for sanity checks of the PLC db when running refreshpeer+sfa
+
 * Thu Jul 15 2010 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - myplc-5.0-9
 - avoid duplication of the plc-config binary in both myplc and myplc-config rpms