summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChef Expeditor <eng-services-ops+chef-ci@chef.io>2018-06-07 05:23:25 +0000
committerChef Expeditor <eng-services-ops+chef-ci@chef.io>2018-06-07 05:23:25 +0000
commit15dfd1ade57036c09291f6e317e21057188c87b9 (patch)
tree84709ac0bbef12d942ac11c5cd32cb29e8954bab
parent98cdebc61abc06a357f1146afea03a610e5db366 (diff)
downloadchef-14.2.2.tar.gz
Bump version to 14.2.2 by Chef Expeditorv14.2.2
-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 aeb44d9729..7d223bfe60 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,15 +1,16 @@
<!-- usage documentation: http://expeditor-docs.es.chef.io/configuration/changelog/ -->
-<!-- latest_release 14.2.1 -->
-## [v14.2.1](https://github.com/chef/chef/tree/v14.2.1) (2018-06-07)
+<!-- latest_release 14.2.2 -->
+## [v14.2.2](https://github.com/chef/chef/tree/v14.2.2) (2018-06-07)
#### Merged Pull Requests
-- Add skip_publisher_check property to powershell_package [#7259](https://github.com/chef/chef/pull/7259) ([Happycoil](https://github.com/Happycoil))
+- Expand development docs with branch/backport + more [#7343](https://github.com/chef/chef/pull/7343) ([tas50](https://github.com/tas50))
<!-- latest_release -->
<!-- release_rollup since=14.1.12 -->
### Changes since 14.1.12 release
#### Merged Pull Requests
+- Expand development docs with branch/backport + more [#7343](https://github.com/chef/chef/pull/7343) ([tas50](https://github.com/tas50)) <!-- 14.2.2 -->
- Add skip_publisher_check property to powershell_package [#7259](https://github.com/chef/chef/pull/7259) ([Happycoil](https://github.com/Happycoil)) <!-- 14.2.1 -->
- bump ohai to 14.2.0 [#7333](https://github.com/chef/chef/pull/7333) ([lamont-granquist](https://github.com/lamont-granquist)) <!-- 14.1.36 -->
- Use inspec-core, new ffi gem, and bump deps [#7332](https://github.com/chef/chef/pull/7332) ([lamont-granquist](https://github.com/lamont-granquist)) <!-- 14.1.35 -->
diff --git a/Gemfile.lock b/Gemfile.lock
index 43c38b9880..35c5e1ce65 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -9,10 +9,10 @@ GIT
PATH
remote: .
specs:
- chef (14.2.1)
+ chef (14.2.2)
addressable
bundler (>= 1.10)
- chef-config (= 14.2.1)
+ chef-config (= 14.2.2)
chef-zero (>= 13.0)
diff-lcs (~> 1.2, >= 1.2.4)
erubis (~> 2.7)
@@ -40,10 +40,10 @@ PATH
specinfra (~> 2.10)
syslog-logger (~> 1.6)
uuidtools (~> 2.1.5)
- chef (14.2.1-universal-mingw32)
+ chef (14.2.2-universal-mingw32)
addressable
bundler (>= 1.10)
- chef-config (= 14.2.1)
+ chef-config (= 14.2.2)
chef-zero (>= 13.0)
diff-lcs (~> 1.2, >= 1.2.4)
erubis (~> 2.7)
@@ -86,7 +86,7 @@ PATH
PATH
remote: chef-config
specs:
- chef-config (14.2.1)
+ chef-config (14.2.2)
addressable
fuzzyurl
mixlib-config (~> 2.0)
diff --git a/VERSION b/VERSION
index 83ecc0b2ef..3b85ad6690 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-14.2.1 \ No newline at end of file
+14.2.2 \ 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 469f9bdd20..a9cae3a2da 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.2.1"
+ VERSION = "14.2.2"
end
#
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index 754d5771c6..6b7512dda9 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.2.1")
+ VERSION = Chef::VersionString.new("14.2.2")
end
#