summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--CHANGELOG.md7
-rw-r--r--Gemfile.lock26
-rw-r--r--VERSION2
-rw-r--r--chef-config/lib/chef-config/version.rb2
-rw-r--r--chef.gemspec2
-rw-r--r--lib/chef/resource/windows_task.rb4
-rw-r--r--lib/chef/version.rb2
-rw-r--r--omnibus/Gemfile.lock16
8 files changed, 31 insertions, 30 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6168a758ef..be0427fee5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,15 +1,16 @@
<!-- usage documentation: http://expeditor-docs.es.chef.io/configuration/changelog/ -->
-<!-- latest_release 14.4.14 -->
-## [v14.4.14](https://github.com/chef/chef/tree/v14.4.14) (2018-07-23)
+<!-- latest_release 14.4.15 -->
+## [v14.4.15](https://github.com/chef/chef/tree/v14.4.15) (2018-07-24)
#### Merged Pull Requests
-- Add minor version bumping to Expeditor config [#7501](https://github.com/chef/chef/pull/7501) ([tas50](https://github.com/tas50))
+- Bump version of ISO8601 to latest (0.11.0) [#7505](https://github.com/chef/chef/pull/7505) ([Nimesh-Msys](https://github.com/Nimesh-Msys))
<!-- latest_release -->
<!-- release_rollup since=14.3.37 -->
### Changes since 14.3.37 release
#### Merged Pull Requests
+- Bump version of ISO8601 to latest (0.11.0) [#7505](https://github.com/chef/chef/pull/7505) ([Nimesh-Msys](https://github.com/Nimesh-Msys)) <!-- 14.4.15 -->
- Add minor version bumping to Expeditor config [#7501](https://github.com/chef/chef/pull/7501) ([tas50](https://github.com/tas50)) <!-- 14.4.14 -->
- Make sure knife descriptions all have periods [#7473](https://github.com/chef/chef/pull/7473) ([tas50](https://github.com/tas50)) <!-- 14.4.13 -->
- Functional tests: Ensure we logon with the local security_user account [#7498](https://github.com/chef/chef/pull/7498) ([stuartpreston](https://github.com/stuartpreston)) <!-- 14.4.12 -->
diff --git a/Gemfile.lock b/Gemfile.lock
index 72a223e739..845ef19189 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -9,10 +9,10 @@ GIT
PATH
remote: .
specs:
- chef (14.4.14)
+ chef (14.4.15)
addressable
bundler (>= 1.10)
- chef-config (= 14.4.14)
+ chef-config (= 14.4.15)
chef-zero (>= 13.0)
diff-lcs (~> 1.2, >= 1.2.4)
erubis (~> 2.7)
@@ -20,7 +20,7 @@ PATH
ffi-yajl (~> 2.2)
highline (~> 1.6, >= 1.6.9)
iniparse (~> 1.4)
- iso8601 (~> 0.9.1)
+ iso8601 (~> 0.11.0)
mixlib-archive (~> 0.4)
mixlib-authentication (~> 2.1)
mixlib-cli (~> 1.7)
@@ -40,10 +40,10 @@ PATH
specinfra (~> 2.10)
syslog-logger (~> 1.6)
uuidtools (~> 2.1.5)
- chef (14.4.14-universal-mingw32)
+ chef (14.4.15-universal-mingw32)
addressable
bundler (>= 1.10)
- chef-config (= 14.4.14)
+ chef-config (= 14.4.15)
chef-zero (>= 13.0)
diff-lcs (~> 1.2, >= 1.2.4)
erubis (~> 2.7)
@@ -51,7 +51,7 @@ PATH
ffi-yajl (~> 2.2)
highline (~> 1.6, >= 1.6.9)
iniparse (~> 1.4)
- iso8601 (~> 0.9.1)
+ iso8601 (~> 0.11.0)
mixlib-archive (~> 0.4)
mixlib-authentication (~> 2.1)
mixlib-cli (~> 1.7)
@@ -86,7 +86,7 @@ PATH
PATH
remote: chef-config
specs:
- chef-config (14.4.14)
+ chef-config (14.4.15)
addressable
fuzzyurl
mixlib-config (>= 2.2.12, < 3.0)
@@ -149,7 +149,7 @@ GEM
highline (1.7.10)
htmlentities (4.3.4)
iniparse (1.4.4)
- inspec-core (2.2.35)
+ inspec-core (2.2.41)
addressable (~> 2.4)
faraday (>= 0.9.0)
hashie (~> 3.4)
@@ -169,7 +169,7 @@ GEM
tomlrb (~> 1.2)
train-core (~> 1.4, >= 1.4.15)
ipaddress (0.8.3)
- iso8601 (0.9.1)
+ iso8601 (0.11.0)
json (2.1.0)
launchy (2.4.3)
addressable (~> 2.3)
@@ -182,8 +182,8 @@ GEM
mixlib-config (2.2.13)
tomlrb
mixlib-log (2.0.4)
- mixlib-shellout (2.3.2)
- mixlib-shellout (2.3.2-universal-mingw32)
+ mixlib-shellout (2.4.0)
+ mixlib-shellout (2.4.0-universal-mingw32)
win32-process (~> 0.8.2)
wmi-lite (~> 1.0)
multi_json (1.13.1)
@@ -339,13 +339,13 @@ GEM
win32-service (1.0.1)
ffi
ffi-win32-extensions
- win32-taskscheduler (1.0.9)
+ win32-taskscheduler (1.0.10)
ffi
structured_warnings
windows-api (0.4.4)
win32-api (>= 1.4.5)
wmi-lite (1.0.0)
- yard (0.9.14)
+ yard (0.9.15)
PLATFORMS
ruby
diff --git a/VERSION b/VERSION
index 74d21629c0..1197ed11b9 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-14.4.14 \ No newline at end of file
+14.4.15 \ No newline at end of file
diff --git a/chef-config/lib/chef-config/version.rb b/chef-config/lib/chef-config/version.rb
index 54ee292d48..8e81a49fa6 100644
--- a/chef-config/lib/chef-config/version.rb
+++ b/chef-config/lib/chef-config/version.rb
@@ -21,7 +21,7 @@
module ChefConfig
CHEFCONFIG_ROOT = File.expand_path("../..", __FILE__)
- VERSION = "14.4.14".freeze
+ VERSION = "14.4.15".freeze
end
#
diff --git a/chef.gemspec b/chef.gemspec
index cb92cc8003..2242d6e5fd 100644
--- a/chef.gemspec
+++ b/chef.gemspec
@@ -38,7 +38,7 @@ Gem::Specification.new do |s|
s.add_dependency "plist", "~> 3.2"
s.add_dependency "iniparse", "~> 1.4"
s.add_dependency "addressable"
- s.add_dependency "iso8601", "~> 0.9.1"
+ s.add_dependency "iso8601", "~> 0.11.0"
# Audit mode requires these, so they are non-developmental dependencies now
%w{rspec-core rspec-expectations rspec-mocks}.each { |gem| s.add_dependency gem, "~> 3.5" }
diff --git a/lib/chef/resource/windows_task.rb b/lib/chef/resource/windows_task.rb
index fd4c93907d..b311caf743 100644
--- a/lib/chef/resource/windows_task.rb
+++ b/lib/chef/resource/windows_task.rb
@@ -267,8 +267,8 @@ class Chef
# Converts the number of seconds to an ISO8601 duration format and returns it.
# Ref : https://github.com/arnau/ISO8601/blob/master/lib/iso8601/duration.rb#L18-L23
# e.g.
- # ISO8601::Duration.new(65707200)
- # returns 'P65707200S'
+ # ISO8601::Duration.new(65707200).to_s
+ # returns 'PT65707200S'
def sec_to_dur(seconds)
ISO8601::Duration.new(seconds.to_i).to_s
end
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index abb43c168d..df442d5658 100644
--- a/lib/chef/version.rb
+++ b/lib/chef/version.rb
@@ -23,7 +23,7 @@ require "chef/version_string"
class Chef
CHEF_ROOT = File.expand_path("../..", __FILE__)
- VERSION = Chef::VersionString.new("14.4.14")
+ VERSION = Chef::VersionString.new("14.4.15")
end
#
diff --git a/omnibus/Gemfile.lock b/omnibus/Gemfile.lock
index bdbf0fd698..9519ea3589 100644
--- a/omnibus/Gemfile.lock
+++ b/omnibus/Gemfile.lock
@@ -18,7 +18,7 @@ GIT
GIT
remote: https://github.com/chef/omnibus-software
- revision: 836bd650d49e6350dfa40b43a1398c5847a6fd42
+ revision: d48afdf29dd9c9d0562656675d1036cd035c2a46
branch: master
specs:
omnibus-software (4.0.0)
@@ -31,13 +31,13 @@ GEM
addressable (2.5.2)
public_suffix (>= 2.0.2, < 4.0)
awesome_print (1.8.0)
- aws-sdk (2.11.90)
- aws-sdk-resources (= 2.11.90)
- aws-sdk-core (2.11.90)
+ aws-sdk (2.11.93)
+ aws-sdk-resources (= 2.11.93)
+ aws-sdk-core (2.11.93)
aws-sigv4 (~> 1.0)
jmespath (~> 1.0)
- aws-sdk-resources (2.11.90)
- aws-sdk-core (= 2.11.90)
+ aws-sdk-resources (2.11.93)
+ aws-sdk-core (= 2.11.93)
aws-sigv4 (1.0.3)
berkshelf (4.3.5)
addressable (~> 2.3, >= 2.3.4)
@@ -135,8 +135,8 @@ GEM
mixlib-versioning
thor
mixlib-log (1.7.1)
- mixlib-shellout (2.3.2)
- mixlib-shellout (2.3.2-universal-mingw32)
+ mixlib-shellout (2.4.0)
+ mixlib-shellout (2.4.0-universal-mingw32)
win32-process (~> 0.8.2)
wmi-lite (~> 1.0)
mixlib-versioning (1.2.2)
View Lorry Controller Status