tyler.durden
/
icingaweb2
mirror of https://github.com/Icinga/icingaweb2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
icingaweb2/.vagrant-puppet
History
Eric Lippmann 07d04628cf Merge branch 'feature/installation-and-configuration-cleanup-5638' 
Conflicts:
	config/config.ini.in
	library/Icinga/Application/ApplicationBootstrap.php
	library/Icinga/Application/Cli.php
	library/Icinga/Application/EmbeddedWeb.php
	library/Icinga/Application/Logger.php
	library/Icinga/Application/Modules/Manager.php
	library/Icinga/Application/Web.php
	library/Icinga/Authentication/Backend/DbUserBackend.php
	library/Icinga/Authentication/Manager.php
	library/Icinga/User/Preferences/IniStore.php
	test/php/library/Icinga/Application/LoggerTest.php
 		2014-03-03 19:03:39 +01:00
..
files Merge branch 'feature/installation-and-configuration-cleanup-5638' 2014-03-03 19:03:39 +01:00
manifests Merge branch 'feature/installation-and-configuration-cleanup-5638' 2014-03-03 19:03:39 +01:00
modules Vagrant: Fix first boot+provisioning of the virtual machine 2014-01-28 15:54:13 +01:00