andrewschleifer/cdist
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Resolve conflict.

Browse source
This commit is contained in:
Darko Poljak 2016-06-22 12:56:53 +02:00
commit a12b74b2f5
10 changed files with 261 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

3
docs/changelog
View file

@ -3,6 +3,9 @@ Changelog
next:
* Core: Add files directory for static files (Darko Poljak)
* Core: Fix conflicting requirements (Darko Poljak)
* Custom: Add bash and zsh completions (Darko Poljak)
* Core: Improve error reporting for local and remote run command (Darko Poljak)
* New type: __jail_freebsd9: Handle jail management on FreeBSD <= 9.X (Jake Guffey)
* New type: __jail_freebsd10: Handle jail management on FreeBSD >= 10.0 (Jake Guffey)
* Type __jail: Dynamically select the correct jail subtype based on target host OS (Jake Guffey)