From: Stephen Soltesz <soltesz@cs.princeton.edu>
Date: Fri, 6 May 2011 20:51:53 +0000 (+0000)
Subject: Merge branch 'master' of git://git.planet-lab.org/monitor
X-Git-Tag: monitor-3.1-2~8
X-Git-Url: http://git.onelab.eu/?p=monitor.git;a=commitdiff_plain;h=a947da59b6ed3b9fe3c50ad67111105c8734581b;hp=3b89b6f104b7e4e93e4c32a4d188664bb6b3e34f

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

diff --git a/Monitor.spec b/Monitor.spec
index 5b79c11..68ed180 100644
--- 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 0
+%define taglevel 1
 
 %define release %{taglevel}%{?pldistro:.%{pldistro}}%{?date:.%{date}}
 %global python_sitearch	%( python -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)" )
@@ -349,6 +349,9 @@ fi
 
 
 %changelog
+* Fri May 06 2011 s s <soltesz@cs.princeton.edu> - monitor-3.1-1
+- last tag before some more major changes
+
 * Thu May 20 2010 Stephen Soltesz <soltesz@cs.princeton.edu> - Monitor-3.0-35
 - Add CSV link on Advanced query
 - Preparing to branch
diff --git a/zabbix.spec b/zabbix.spec
index 512fe62..8dd0fed 100644
--- a/zabbix.spec
+++ b/zabbix.spec
@@ -295,6 +295,9 @@ rm -f %{zabbix_logdir}/zabbix_agentd.log
 %{zabbix_webdir}
 
 %changelog
+* Fri May 06 2011 s s <soltesz@cs.princeton.edu> - monitor-3.1-1
+- last tag before some more major changes
+
 * Thu May 20 2010 Stephen Soltesz <soltesz@cs.princeton.edu> - Monitor-3.0-35
 - Add CSV link on Advanced query
 - Preparing to branch
@@ -507,6 +510,6 @@ rm -f %{zabbix_logdir}/zabbix_agentd.log
 
 %define module_current_branch 3.0
 
-%define taglevel 0
+%define taglevel 1
 
 %define version 3.1