Merge branch 'master' into 4.0-pre-not-stable

Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>

Conflicts:
	docs/changelog
This commit is contained in:
Nico Schottelius 2014-01-24 01:20:12 +01:00
commit 8216ec88e4
5 changed files with 14 additions and 6 deletions

View file

@ -8,7 +8,10 @@ Changelog
* Core: Integrate initial install support
* Core: Integrate initial preos support
3.0.3:
3.0.4:
* Type __apt_ppa: Install required software (Steven Armstrong)
3.0.3: 2014-01-22
* Core: Enhance error message when requirement is missing object id
* Core: Add environment variable to select shell for executing scripts (Daniel Heule)
* Explorer hostname: Return host name by using uname -n