Merge branch 'master' into feature_files_export

This commit is contained in:
Darko Poljak 2016-06-22 12:26:10 +02:00
commit cfe422a5ab
30 changed files with 856 additions and 6 deletions

7
docs/2016-06-06.org Normal file
View file

@ -0,0 +1,7 @@
* Enhance cdist speed
** Start separate server with own option
** Reconfigure normal sshd with appropriate options
** Start various own daemons
** Use custom multiplexing protocol
** Support native Python code
*** Use manifest.py instead of manifest if available

View file

@ -3,6 +3,9 @@ Changelog
next:
* Core: Add files directory for static files (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)
4.1.0: 2016-05-27
* Documentation: Migrate to reStructuredText format and sphinx (Darko Poljak)