summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChef Expeditor <eng-services-ops+chef-ci@chef.io>2018-05-09 19:54:49 +0000
committerChef Expeditor <eng-services-ops+chef-ci@chef.io>2018-05-09 19:54:49 +0000
commit189743e30d61d213aa1f90429a2cdf72467173fb (patch)
tree4e1266c823669fb41ae44836a3ae5ed6b5e59b28
parentca8bca92841d8affa7a0a43f6c2c884015c5079b (diff)
downloadchef-189743e30d61d213aa1f90429a2cdf72467173fb.tar.gz
Bump version to 14.1.2 by Chef Expeditorv14.1.2
-rw-r--r--CHANGELOG.md12
-rw-r--r--Gemfile.lock12
-rw-r--r--VERSION2
-rw-r--r--chef-config/lib/chef-config/version.rb2
-rw-r--r--lib/chef/version.rb2
5 files changed, 19 insertions, 11 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 65ef1c6e29..37ef86a0a4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,8 +1,16 @@
<!-- usage documentation: http://expeditor-docs.es.chef.io/configuration/changelog/ -->
-<!-- latest_release -->
+<!-- latest_release 14.1.2 -->
+## [v14.1.2](https://github.com/chef/chef/tree/v14.1.2) (2018-05-09)
+
+#### Merged Pull Requests
+- Remove redundant &quot;?&quot; in knife configure [#7235](https://github.com/chef/chef/pull/7235) ([alexymik](https://github.com/alexymik))
<!-- latest_release -->
-<!-- release_rollup -->
+<!-- release_rollup since=14.1.1 -->
+### Changes since 14.1.1 release
+
+#### Merged Pull Requests
+- Remove redundant &quot;?&quot; in knife configure [#7235](https://github.com/chef/chef/pull/7235) ([alexymik](https://github.com/alexymik)) <!-- 14.1.2 -->
<!-- release_rollup -->
<!-- latest_stable_release -->
diff --git a/Gemfile.lock b/Gemfile.lock
index 0cc3ab7f76..8e3c725c34 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -15,10 +15,10 @@ GIT
PATH
remote: .
specs:
- chef (14.1.1)
+ chef (14.1.2)
addressable
bundler (>= 1.10)
- chef-config (= 14.1.1)
+ chef-config (= 14.1.2)
chef-zero (>= 13.0)
diff-lcs (~> 1.2, >= 1.2.4)
erubis (~> 2.7)
@@ -46,10 +46,10 @@ PATH
specinfra (~> 2.10)
syslog-logger (~> 1.6)
uuidtools (~> 2.1.5)
- chef (14.1.1-universal-mingw32)
+ chef (14.1.2-universal-mingw32)
addressable
bundler (>= 1.10)
- chef-config (= 14.1.1)
+ chef-config (= 14.1.2)
chef-zero (>= 13.0)
diff-lcs (~> 1.2, >= 1.2.4)
erubis (~> 2.7)
@@ -92,7 +92,7 @@ PATH
PATH
remote: chef-config
specs:
- chef-config (14.1.1)
+ chef-config (14.1.2)
addressable
fuzzyurl
mixlib-config (~> 2.0)
@@ -214,7 +214,7 @@ GEM
little-plugger (~> 1.1)
multi_json (~> 1.10)
method_source (0.9.0)
- mixlib-archive (0.4.5)
+ mixlib-archive (0.4.6)
mixlib-log
mixlib-authentication (2.0.0)
mixlib-cli (1.7.0)
diff --git a/VERSION b/VERSION
index e199ade4b1..73c5170b31 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-14.1.1 \ No newline at end of file
+14.1.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 40774d189f..d8fe846df2 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.1.1"
+ VERSION = "14.1.2"
end
#
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index 572e2f9ef4..8023be13b1 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.1.1")
+ VERSION = Chef::VersionString.new("14.1.2")
end
#