summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChef Expeditor <eng-services-ops+chef-ci@chef.io>2018-01-29 18:59:29 +0000
committerChef Expeditor <eng-services-ops+chef-ci@chef.io>2018-01-29 18:59:29 +0000
commit42ef5f3bb76af786a2462d6f5bc623612afd0444 (patch)
tree53bf838b9b289c1440927655761ce8585ca7a70d
parentddb13ff46ad738c7f8088c7a6038fdbab6732bad (diff)
downloadchef-42ef5f3bb76af786a2462d6f5bc623612afd0444.tar.gz
Bump version to 14.0.39 by Expeditorv14.0.39
-rw-r--r--CHANGELOG.md7
-rw-r--r--Gemfile.lock10
-rw-r--r--VERSION2
-rw-r--r--chef-config/lib/chef-config/version.rb2
-rw-r--r--lib/chef/version.rb2
5 files changed, 12 insertions, 11 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index d51526d144..af10bb688b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,15 +1,16 @@
<!-- usage documentation: http://expeditor-docs.es.chef.io/configuration/changelog/ -->
-<!-- latest_release 14.0.38 -->
-## [v14.0.38](https://github.com/chef/chef/tree/v14.0.38) (2018-01-29)
+<!-- latest_release 14.0.39 -->
+## [v14.0.39](https://github.com/chef/chef/tree/v14.0.39) (2018-01-29)
#### Merged Pull Requests
-- use a stricter comparison so knife ssh only fails if --exit-on-error [#6582](https://github.com/chef/chef/pull/6582) ([sarkis](https://github.com/sarkis))
+- Ensure package (un)locking is idempotent [#6494](https://github.com/chef/chef/pull/6494) ([Rarian](https://github.com/Rarian))
<!-- latest_release -->
<!-- release_rollup since=13.7.16 -->
### Changes since 13.7.16 release
#### Merged Pull Requests
+- Ensure package (un)locking is idempotent [#6494](https://github.com/chef/chef/pull/6494) ([Rarian](https://github.com/Rarian)) <!-- 14.0.39 -->
- use a stricter comparison so knife ssh only fails if --exit-on-error [#6582](https://github.com/chef/chef/pull/6582) ([sarkis](https://github.com/sarkis)) <!-- 14.0.38 -->
- Update error handling for &quot;knife status&quot; #3287 [#6756](https://github.com/chef/chef/pull/6756) ([cramaechi](https://github.com/cramaechi)) <!-- 14.0.37 -->
- Add create, delete and configure actions to windows_service [#6804](https://github.com/chef/chef/pull/6804) ([jasonwbarnett](https://github.com/jasonwbarnett)) <!-- 14.0.36 -->
diff --git a/Gemfile.lock b/Gemfile.lock
index 29f2a4cc6f..2790f77d14 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -35,10 +35,10 @@ GIT
PATH
remote: .
specs:
- chef (14.0.38)
+ chef (14.0.39)
addressable
bundler (>= 1.10)
- chef-config (= 14.0.38)
+ chef-config (= 14.0.39)
chef-zero (>= 13.0)
diff-lcs (~> 1.2, >= 1.2.4)
erubis (~> 2.7)
@@ -65,10 +65,10 @@ PATH
specinfra (~> 2.10)
syslog-logger (~> 1.6)
uuidtools (~> 2.1.5)
- chef (14.0.38-universal-mingw32)
+ chef (14.0.39-universal-mingw32)
addressable
bundler (>= 1.10)
- chef-config (= 14.0.38)
+ chef-config (= 14.0.39)
chef-zero (>= 13.0)
diff-lcs (~> 1.2, >= 1.2.4)
erubis (~> 2.7)
@@ -110,7 +110,7 @@ PATH
PATH
remote: chef-config
specs:
- chef-config (14.0.38)
+ chef-config (14.0.39)
addressable
fuzzyurl
mixlib-config (~> 2.0)
diff --git a/VERSION b/VERSION
index f2a318c857..6d5ec90ee4 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-14.0.38 \ No newline at end of file
+14.0.39 \ 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 567ed6f551..b99b3cef41 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.0.38"
+ VERSION = "14.0.39"
end
#
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index 23f70175d4..b052f39345 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.0.38")
+ VERSION = Chef::VersionString.new("14.0.39")
end
#