Merge branch 'master' of ssh://git.planet-lab.org/git/monitor

diff --git a/Monitor.spec b/Monitor.spec
index f47a12c..aa3b644 100644 (file)
--- a/Monitor.spec
+++ b/Monitor.spec
@@ -7,7 +7,7 @@
 %define name monitor
 # keep this version in sync with monitor/monitor_version.py
 %define version 3.1
-%define taglevel 2
+%define taglevel 3
 
 %define release %{taglevel}%{?pldistro:.%{pldistro}}%{?date:.%{date}}
 %global python_sitearch        %( python -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)" )
@@ -354,6 +354,9 @@ fi
 
 
 %changelog
+* Fri May 27 2011 s s <soltesz@cs.princeton.edu> - monitor-3.1-3
+- fixing syntax errors
+
 * Fri May 27 2011 s s <soltesz@cs.princeton.edu> - monitor-3.1-2
 - Add better requirements list, work with TurboGears packaged by fedora,
 - Remove some zabbix files

diff --git a/zabbix.spec b/zabbix.spec
index d7d1e7d..7a3f56e 100644 (file)
--- a/zabbix.spec
+++ b/zabbix.spec
@@ -295,6 +295,9 @@ rm -f %{zabbix_logdir}/zabbix_agentd.log
 %{zabbix_webdir}
 
 %changelog
+* Fri May 27 2011 s s <soltesz@cs.princeton.edu> - monitor-3.1-3
+- fixing syntax errors
+
 * Fri May 27 2011 s s <soltesz@cs.princeton.edu> - monitor-3.1-2
 - Add better requirements list, work with TurboGears packaged by fedora,
 - Remove some zabbix files
@@ -515,6 +518,6 @@ rm -f %{zabbix_logdir}/zabbix_agentd.log
 
 %define module_current_branch 3.0
 
-%define taglevel 2
+%define taglevel 3
 
 %define version 3.1