X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=zabbix.spec;h=d7d1e7dc7aeef887889a75acaed57415583f9a9b;hb=968c74bb414a846f63bd8809b612cba7743e3cd8;hp=956d9c0f7cb59d043e3dc857da52495b32a7c853;hpb=015efbd7491191dbcffd92f7dac44dd6b0bf6a41;p=monitor.git

diff --git a/zabbix.spec b/zabbix.spec
index 956d9c0..d7d1e7d 100644
--- a/zabbix.spec
+++ b/zabbix.spec
@@ -295,6 +295,37 @@ rm -f %{zabbix_logdir}/zabbix_agentd.log
 %{zabbix_webdir}
 
 %changelog
+* 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
+- Add a controllers_local.py for custom extensions
+
+* 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
+
+* Wed May 12 2010 Talip Baris Metin <Talip-Baris.Metin@sophia.inria.fr> - Monitor-3.0-34
+- * copy selections to clipbord on Advanced Query page
+- * RPM Pattern as regexp
+- * scan ipmi port
+
+* Tue Apr 27 2010 Talip Baris Metin <Talip-Baris.Metin@sophia.inria.fr> - Monitor-3.0-33
+- handle hostname changes
+
+* Tue Apr 20 2010 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - Monitor-3.0-32
+- from this version, suitable for 5.0
+- requires bootcd with the new 5.0 naming style 3-part nodefamily
+
+* Mon Apr 12 2010 Stephen Soltesz <soltesz@cs.princeton.edu> - Monitor-3.0-31
+- added fix for node delete/add causing conflicts in MyOps db.
+- added statistics scripts
+
+* Thu Jan 21 2010 Talip Baris Metin <Talip-Baris.Metin@sophia.inria.fr> - Monitor-3.0-30
+- * fix paths for automate script
+
 * Tue Dec 22 2009 Baris Metin <Talip-Baris.Metin@sophia.inria.fr> - Monitor-3.0-29
 - - separate pcucontrol as an svn module
 - - restore easy_instal back into post install stage of server-deps
@@ -482,8 +513,8 @@ rm -f %{zabbix_logdir}/zabbix_agentd.log
 - initial packaging
 
 
-%define module_current_branch 2.0
+%define module_current_branch 3.0
 
-%define taglevel 29
+%define taglevel 2
 
-%define version 3.0
+%define version 3.1