[icinga-checkins] icinga.org: icinga-web/mhein/extlayout: Merge branch 'jmosshammer/principal ' of git.icinga.org:icinga-web into jmosshammer/default2

git at icinga.org git at icinga.org
Tue May 11 19:18:11 CEST 2010


Module: icinga-web
Branch: mhein/extlayout
Commit: 57a0bf4cabd54eab3fb7dddf2726851797c05cc8
URL:    https://git.icinga.org/?p=icinga-web.git;a=commit;h=57a0bf4cabd54eab3fb7dddf2726851797c05cc8

Author: jmosshammer <jannis.mosshammer at netways.de>
Date:   Thu May  6 12:51:20 2010 +0200

Merge branch 'jmosshammer/principal' of git.icinga.org:icinga-web into jmosshammer/default2

Conflicts:
	app/modules/AppKit/cache/Admin/DataProvider/GroupProvider.xml
	app/modules/AppKit/cache/Admin/DataProvider/PrincipalProvider.xml
	app/modules/AppKit/cache/Admin/DataProvider/UserProvider.xml
	app/modules/AppKit/cache/Admin/Groups/Alter.xml
	app/modules/AppKit/cache/Admin/Groups/Remove.xml
	app/modules/AppKit/cache/Privileges/Index.xml
	etc/make/files.mk
	lib/icingaScheduler/CronAgaviAdapter.class.php
	lib/icingaScheduler/CronJobParser/CronDBParser.class.php
	lib/icingaScheduler/res/storage.dat

---







More information about the icinga-checkins mailing list