[icinga-checkins] icinga.org: icinga-web/r1.8: Rebase

git at icinga.org git at icinga.org
Mon Jan 14 13:41:52 CET 2013


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

Author: Jannis Mosshammer <jannis.mosshammer at netways.de>
Date:   Thu Dec 20 16:39:19 2012 +0100

Rebase
Merge branch 'jmosshammer/performance' of ssh://git.icinga.org/icinga-web into jmosshammer/1.8.2

Conflicts:
	app/modules/AppKit/lib/database/models/NsmUser.php
	app/modules/AppKit/models/Credential/AggregatorModel.class.php
	app/modules/Cronks/lib/js/Cronk/grid/MetaGridPanel.js

---







More information about the icinga-checkins mailing list