[icinga-checkins] icinga.org: icinga-web/master: Merge branch 'jmosshammer/multiconnection' of ssh://git.icinga.org/icinga-web

git at icinga.org git at icinga.org
Tue Apr 24 15:01:15 CEST 2012


Module: icinga-web
Branch: master
Commit: cfb7386bc0c7e9e0d4301f8511d27d41dcef8ca8
URL:    https://git.icinga.org/?p=icinga-web.git;a=commit;h=cfb7386bc0c7e9e0d4301f8511d27d41dcef8ca8

Author: Jannis Mosshammer <jannis.mosshammer at netways.de>
Date:   Wed Apr 11 14:37:06 2012 +0200

Merge branch 'jmosshammer/multiconnection' of ssh://git.icinga.org/icinga-web

Conflicts:
	app/modules/Api/lib/database/IcingaDoctrineDatabase.class.php
	app/modules/Cronks/lib/js/grid/GridPanel.js
	app/modules/Cronks/lib/js/grid/renderer/IcingaColumnRenderer.js
	lib/doctrine/lib/Doctrine/Connection/IcingaOracle.php

---







More information about the icinga-checkins mailing list