[icinga-checkins] icinga.org: icinga-web/release/1.9.0: Merge branch 'next' into release/1.9.

git at icinga.org git at icinga.org
Mon Apr 29 20:01:22 CEST 2013


Module: icinga-web
Branch: release/1.9.0
Commit: 8bf013e3d803a518cf13895a9bfb0ed92aa53a66
URL:    https://git.icinga.org/?p=icinga-web.git;a=commit;h=8bf013e3d803a518cf13895a9bfb0ed92aa53a66

Author: Markus Frosch <markus at lazyfrosch.de>
Date:   Mon Apr 29 19:54:16 2013 +0200

Merge branch 'next' into release/1.9.0

Conflicts:
	app/modules/Cronks/lib/js/Cronk/grid/renderer/AdvancedHostStatusColumnRenderer.js
	app/modules/Cronks/lib/js/Cronk/grid/renderer/ColumnRenderer.js
	app/modules/Cronks/models/Provider/CronksDataModel.class.php
	configure
	doc/VERSION
	etc/make/version.m4
	etc/schema/mysql.sql
	icinga-web.spec

---







More information about the icinga-checkins mailing list