Merge remote-tracking branch 'telmich/master'

11 years ago · a956583169
parent 698be8e5b6 eb20e10601
commit a956583169
2 changed files with 3 additions and 2 deletions
--- a/cdist/conf/type/__locale/manifest
+++ b/cdist/conf/type/__locale/manifest
@ -29,7 +29,7 @@ case "$os" in
        # Debian needs a seperate package
        __package locales --state present
    ;;
-    suse)
+    archlinux|suse)
        :
    ;;
    *)
--- a/docs/changelog
+++ b/docs/changelog
@ -5,11 +5,12 @@ Changelog
 	* Exception: No braces means author == Nico Schottelius


-3.1.6:
+3.1.6: 2014-08-18
 	* New Type: __ssh_dot_ssh
 	* Type __package_yum: Support retrieving package via URL
 	* Type __hostname: Support SuSE and have CentOS use sysconfig value
 	* Type __locale: Support SuSE
+	* Type __locale: Support Archlinux
 	* Type __timezone: Support SuSE
 	* Type __file: Support MacOS X (Manuel Hutter)
 	* Type __iptables_apply: Add "reset" to init.d script of iptables