[icinga-checkins] icinga.org: icinga-core/rbartels/cgi: Merge branch 'mfriedrich/queue' into mfriedrich/ido

git at icinga.org git at icinga.org
Thu Feb 7 01:23:48 CET 2013


Module: icinga-core
Branch: rbartels/cgi
Commit: 30d59f0a4673372430be9e1380a559c35d81010c
URL:    https://git.icinga.org/?p=icinga-core.git;a=commit;h=30d59f0a4673372430be9e1380a559c35d81010c

Author: Michael Friedrich <michael.friedrich at netways.de>
Date:   Wed Jan 16 21:23:32 2013 +0100

Merge branch 'mfriedrich/queue' into mfriedrich/ido

Conflicts:
	module/idoutils/config/ido2db.cfg-sample.in
	module/idoutils/src/db.c
	module/idoutils/src/ido2db.c

---







More information about the icinga-checkins mailing list