From bfbc6210105ac0f40a65b161f09155f0291c1e35 Mon Sep 17 00:00:00 2001
From: Nico Schottelius <nico@bento.schottelius.org>
Date: Tue, 29 Apr 2014 18:10:50 +0200
Subject: [PATCH] ++releasedate

Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
---
 cdist/conf/type/__yum_repo/files/repo.template | 3 ++-
 cdist/conf/type/__yum_repo/man.text            | 4 ++--
 cdist/conf/type/__yum_repo/parameter/boolean   | 1 -
 cdist/conf/type/__yum_repo/parameter/optional  | 1 +
 docs/changelog                                 | 2 +-
 5 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/cdist/conf/type/__yum_repo/files/repo.template b/cdist/conf/type/__yum_repo/files/repo.template
index 73ef00f2..3e14c8b6 100755
--- a/cdist/conf/type/__yum_repo/files/repo.template
+++ b/cdist/conf/type/__yum_repo/files/repo.template
@@ -11,6 +11,7 @@ single_value='name
 metalink
 mirrorlist
 gpgcakey
+gpgcheck 
 exclude
 includepkgs
 failovermethod
@@ -49,7 +50,7 @@ for key in baseurl gpgkey; do
    fi
 done
 # boolean properties
-for key in enabled gpgcheck repo_gpgcheck keepalive skip_if_unavailable; do
+for key in enabled repo_gpgcheck keepalive skip_if_unavailable; do
    if [ -f "$__object/parameter/$key" ]; then
       printf '%s=1\n' "$key"
    fi
diff --git a/cdist/conf/type/__yum_repo/man.text b/cdist/conf/type/__yum_repo/man.text
index 7af95f6a..549cf336 100644
--- a/cdist/conf/type/__yum_repo/man.text
+++ b/cdist/conf/type/__yum_repo/man.text
@@ -32,6 +32,7 @@ mirrorlist::
 gpgkey::
    Can be specified multiple times.
 gpgcakey::
+gpgcheck::
 exclude::
 includepkgs::
 failovermethod::
@@ -58,7 +59,6 @@ cost::
 BOOLEAN PARAMETERS
 ------------------
 enabled::
-gpgcheck::
 repo_gpgcheck::
 disablegroups::
    ! enablegroups
@@ -75,7 +75,7 @@ __yum_repo epel \
    --mirrorlist 'https://mirrors.fedoraproject.org/metalink?repo=epel-$releasever&arch=$basearch' \
    --failovermethod priority \
    --enabled \
-   --gpgcheck \
+   --gpgcheck 1 \
    --gpgkey https://fedoraproject.org/static/0608B895.txt
 --------------------------------------------------------------------------------
 
diff --git a/cdist/conf/type/__yum_repo/parameter/boolean b/cdist/conf/type/__yum_repo/parameter/boolean
index 8fccfa7c..2eb49a93 100644
--- a/cdist/conf/type/__yum_repo/parameter/boolean
+++ b/cdist/conf/type/__yum_repo/parameter/boolean
@@ -1,5 +1,4 @@
 enabled
-gpgcheck
 repo_gpgcheck
 disablegroups
 keepalive
diff --git a/cdist/conf/type/__yum_repo/parameter/optional b/cdist/conf/type/__yum_repo/parameter/optional
index dc432f28..7e185701 100644
--- a/cdist/conf/type/__yum_repo/parameter/optional
+++ b/cdist/conf/type/__yum_repo/parameter/optional
@@ -3,6 +3,7 @@ cost
 exclude
 failovermethod
 gpgcakey
+gpgcheck
 http_caching
 includepkgs
 metadata_expire
diff --git a/docs/changelog b/docs/changelog
index 6e69251f..d7a5af9c 100644
--- a/docs/changelog
+++ b/docs/changelog
@@ -5,7 +5,7 @@ Changelog
 	* Exception: No braces means author == Nico Schottelius
 
 
-3.1.3:
+3.1.3: 2014-04-29
 	* New Type: __yum_repo (Steven Armstrong)
 	* Type __hostname: Add support for CentOS