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:
parent
7991c75119
commit
8092ef8403
|
@ -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,
|
||||
|
|
Loading…
Reference in New Issue