Merge pull request #163 from mhaskel/3.1.1-prep

3.1.1 prep
puppetlabs · Jun 6, 2014 · bc3a9e3 · bc3a9e3
2 parents 3f85446 + d5c648d
commit bc3a9e3
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 13 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,13 @@
+##2014-06-06 - Release 3.1.1
+###Summary
+
+This is a bugfix release to get around dependency issues in PMT 3.6.  This
+version has a dependency on puppetlabs-stdlib >= 4 so PE3.2.x is no longer
+supported.
+
+####Bugfixes
+- Remove deprecated Modulefile as it was causing duplicate dependencies with PMT.
+
 ##2014-05-14 - Release 3.1.0
 ###Summary
 

diff --git a/Modulefile b/Modulefile
diff --git a/metadata.json b/metadata.json
@@ -62,15 +62,15 @@
   "requirements": [
     {
       "name": "pe",
-      "version_requirement": ">= 3.2.0 < 3.4.0"
+      "version_requirement": "3.3.x"
     },
     {
       "name": "puppet",
       "version_requirement": "3.x"
     }
   ],
   "name": "puppetlabs-ntp",
-  "version": "3.1.0",
+  "version": "3.1.1",
   "source": "git://github.com/puppetlabs/puppetlabs-ntp",
   "author": "Puppet Labs",
   "license": "Apache Version 2.0",