tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

2012-05-11 Junichi Satoh <junichi@rworks.jp> 

* ChangeLog: Fixed conflict with previous commit. (Added lost lines.)



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6291 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
jsatoh 2012-05-11 04:47:57 +00:00
parent d458a4792c
commit e27f160c90
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pandora_server/ChangeLog
View File

@ -1,9 +1,18 @@
2012-05-11 Junichi Satoh <junichi@rworks.jp>
* ChangeLog: Fixed conflict with previous commit. (Added lost lines.)
2012-05-10 Sergio Martin <sergio.martin@artica.es>
* lib/PandoraFMS/DB.pm
lib/PandoraFMS/Core.pm: Added the macro _alert_text_severity_ to
the alerts
2012-05-10 Junichi Satoh <junichi@rworks.jp>
* FreeBSD/pandora_server.conf: Synchronized with the generic
configuration file, conf/pandora_server.conf (better default values).
2012-05-09 Dario Rodriguez <dario.rodriguez@artica.es>
* util/plugin/ipmi-plugin.pl,