Merge branch 'master' into master

7 years ago · ad46c39c86
parent f143a70463 93d877f5bf
commit ad46c39c86
2 changed files with 2 additions and 1 deletions
--- a/cdist/conf/type/__apt_source/nonparallel
+++ b/cdist/conf/type/__apt_source/nonparallel
--- a/docs/changelog
+++ b/docs/changelog
@ -5,7 +5,8 @@ next:
 	* Type __letsencrypt_cert: Add support for devuan ascii (Darko Poljak)
 	* Type __systemd_unit: Fix minor issues and add masking unit files support (Adam Dej)
 	* Type __grafana_dashboard: Fix devuan ascii support (Dominique Roux)
-	* Type __package_update_index: Fix error when using OS not using apt (Stu Zhao)
+	* Type __apt_source: Add nonparallel marker (Darko Poljak)
+  * Type __package_update_index: Fix error when using OS not using apt (Stu Zhao)
 	* Type __package_update_index: Support --maxage for type pacman (Stu Zhao)

 4.10.1: 2018-06-21