Merge remote-tracking branch 'ungleich/master' into socket-file-fix

9 years ago · 36627e2969
parent 135b4fbadf 6de632c0b9
commit 36627e2969
1 changed files with 3 additions and 0 deletions
--- a/docs/changelog
+++ b/docs/changelog
@ -3,6 +3,9 @@ Changelog

 next:
 	* Core: Fix ssh ControlPath socket file error (Darko Poljak)
+	* Documentation: Update cdist man page and cdist-references (Darko Poljak)
+	* Documentation: Change cdist and cdist-type__pyvenv man page licenses to GPLv3+ (Darko Poljak)
+	* Documentation: Add FILES to cdist man page (Darko Poljak)

 4.2.1: 2016-07-18
 	* Build: Fix signed release (Darko Poljak)