Merge remote-tracking branch 'ungleich/master'

cdist/conf/explorer/os

@@ -77,6 +77,11 @@ if grep -q ^Fedora /etc/redhat-release 2>/dev/null; then
    exit 0
 fi
 
+if grep -q ^Mitel /etc/redhat-release 2>/dev/null; then
+   echo mitel
+   exit 0
+fi
+
 if [ -f /etc/redhat-release ]; then
    echo redhat
    exit 0

cdist/conf/explorer/os_version

@@ -51,7 +51,7 @@ case "$($__explorer/os)" in
    owl)
       cat /etc/owl-release
    ;;
-   redhat|centos)
+   redhat|centos|mitel)
       cat /etc/redhat-release
    ;;
    slackware)

cdist/conf/type/__consul/files/versions/0.4.1/source

@@ -1 +1 @@
-https://dl.bintray.com/mitchellh/consul/0.4.1_linux_amd64.zip
+https://releases.hashicorp.com/consul/0.4.1/consul_0.4.1_linux_amd64.zip

cdist/conf/type/__consul/files/versions/0.5.0/source

@@ -1 +1 @@
-https://dl.bintray.com/mitchellh/consul/0.5.0_linux_amd64.zip
+https://releases.hashicorp.com/consul/0.5.0/consul_0.5.0_linux_amd64.zip

cdist/conf/type/__consul/files/versions/0.5.1/source

@@ -1 +1 @@
-https://dl.bintray.com/mitchellh/consul/0.5.1_linux_amd64.zip
+https://releases.hashicorp.com/consul/0.5.1/consul_0.5.1_linux_amd64.zip

cdist/conf/type/__consul/files/versions/0.6.0/cksum

@@ -0,0 +1 @@
+688442448 19798264 consul

cdist/conf/type/__consul/files/versions/0.6.0/source

@@ -0,0 +1 @@
+https://releases.hashicorp.com/consul/0.6.0/consul_0.6.0_linux_amd64.zip

cdist/conf/type/__consul/files/versions/0.6.1/cksum

@@ -0,0 +1 @@
+3100584780 20416856 consul

cdist/conf/type/__consul/files/versions/0.6.1/source

@@ -0,0 +1 @@
+https://releases.hashicorp.com/consul/0.6.1/consul_0.6.1_linux_amd64.zip

cdist/conf/type/__consul/files/versions/0.6.2/cksum

@@ -0,0 +1 @@
+2124180907 20416920 consul

cdist/conf/type/__consul/files/versions/0.6.2/source

@@ -0,0 +1 @@
+https://releases.hashicorp.com/consul/0.6.2/consul_0.6.2_linux_amd64.zip

cdist/conf/type/__consul/files/versions/0.6.3/cksum

@@ -0,0 +1 @@
+1832669072 20417720 consul

cdist/conf/type/__consul/files/versions/0.6.3/source

@@ -0,0 +1 @@
+https://releases.hashicorp.com/consul/0.6.3/consul_0.6.3_linux_amd64.zip

cdist/conf/type/__consul/manifest

@@ -1,6 +1,7 @@
 #!/bin/sh
 #
 # 2015 Steven Armstrong (steven-cdist at armstrong.cc)
+# 2016 Nico Schottelius (nico-cdist at schottelius.org)
 #
 # This file is part of cdist.
 #

docs/changelog

@@ -9,8 +9,14 @@ next:
 	* Type __consul: Add source & cksum for 0.5.2 (Steven Armstrong)
 	* Core: Support object ids '.cdist' (Nico Schottelius)
 	* Type __apt_norecommends: Also setup autoremove options (Dmitry Bogatov)
-	* Type __apt_ppa: Do not install legacy package python-software-properties
+	* Type __user_groups: Add NetBSD support (Jonathan A. Kollasch)
-	(Steven Armstrong)
+	* Type __timezone: Add NetBSD support (Jonathan A. Kollasch)
+	* Type __ccollect_source: Add NetBSD support (Jonathan A. Kollasch)
+	* Type __directory: Add NetBSD support (Jonathan A. Kollasch)
+	* Type __file: Add NetBSD support (Jonathan A. Kollasch)
+	* Type __group: Add NetBSD support (Jonathan A. Kollasch)
+	* Type __consul: Add new consul versions (Nico Schottelius)
+	* Type __apt_ppa: Do not install legacy package python-software-properties (Steven Armstrong)
 
 
 3.1.13: 2015-05-16