summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHailee Kenney <hailee@puppet.com>2017-08-09 14:53:13 -0700
committerGitHub <noreply@github.com>2017-08-09 14:53:13 -0700
commitfaadebfb858f59b289ca065674ad024b5e1fdfc5 (patch)
treefcd65cbecef5a643e133b7e22c118f278f5f3518
parente8da44042213e07cdc6f0add7c94bccfbd1dd1f5 (diff)
parenta8302160fb60cd9729dc4de48fd33194bb69fc8b (diff)
Merge pull request #802 from eputnam/release_prep
(MODULES-5436) release prep for 4.17.2
-rw-r--r--CHANGELOG.md13
-rw-r--r--metadata.json4
-rwxr-xr-xspec/functions/strftime_spec.rb4
3 files changed, 17 insertions, 4 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4930a9c..c15ce85 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,16 @@
+# Change log
+
+All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
+and this project adheres to [Semantic Versioning](http://semver.org).
+
+## Supported Release 4.17.2
+### Summary
+
+Patch release that reverts the Puppet version requirement lower bound to again include Puppet 2.7+.
+
+#### Fixed
+- Reverts lower bound of Puppet requirement to 2.7.20
+
## Supported Release 4.17.1
### Summary
diff --git a/metadata.json b/metadata.json
index 0bd0184..79b5be5 100644
--- a/metadata.json
+++ b/metadata.json
@@ -1,6 +1,6 @@
{
"name": "puppetlabs-stdlib",
- "version": "4.17.1",
+ "version": "4.17.2",
"author": "puppetlabs",
"summary": "Standard library of resources for Puppet modules.",
"license": "Apache-2.0",
@@ -101,7 +101,7 @@
"requirements": [
{
"name": "puppet",
- "version_requirement": ">= 4.7.0 < 5.0.0"
+ "version_requirement": ">=2.7.20 < 5.0.0"
}
],
"description": "Standard Library for Puppet Modules",
diff --git a/spec/functions/strftime_spec.rb b/spec/functions/strftime_spec.rb
index e76774a..51f8a73 100755
--- a/spec/functions/strftime_spec.rb
+++ b/spec/functions/strftime_spec.rb
@@ -14,9 +14,9 @@ describe 'strftime' do
expect(result.to_i).to(be > 1311953157)
end
- it "using %s should be lower then 1.5 trillion" do
+ it "using %s should be lower then 2.0 trillion" do
result = scope.function_strftime(["%s"])
- expect(result.to_i).to(be < 1500000000)
+ expect(result.to_i).to(be < 2000000000)
end
it "should return a date when given %Y-%m-%d" do