summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChef Expeditor <eng-services-ops+chef-ci@chef.io>2018-05-04 16:58:26 +0000
committerChef Expeditor <eng-services-ops+chef-ci@chef.io>2018-05-04 16:58:26 +0000
commit28a25d50ea3a1ea0cad7d2cbad0e89dcc82a2802 (patch)
tree49600947deff07b278fcb71ecb103943a47be33f
parentd0271d9f5f8918acbeb1b592c705584fe993dde1 (diff)
downloadchef-28a25d50ea3a1ea0cad7d2cbad0e89dcc82a2802.tar.gz
Bump version to 14.1.1 by Chef Expeditorv14.1.1
-rw-r--r--CHANGELOG.md7
-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, 13 insertions, 12 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 93982c02bf..f35d543c89 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.218 -->
-## [v14.0.218](https://github.com/chef/chef/tree/v14.0.218) (2018-05-02)
+<!-- latest_release 14.1.1 -->
+## [v14.1.1](https://github.com/chef/chef/tree/v14.1.1) (2018-05-04)
#### Merged Pull Requests
-- [MSYS-752] windows task rewrite using win32-taskscheduler [#6815](https://github.com/chef/chef/pull/6815) ([Vasu1105](https://github.com/Vasu1105))
+- Trying to use --recipe-url on Windows with local file fails [#7223](https://github.com/chef/chef/pull/7223) ([tyler-ball](https://github.com/tyler-ball))
<!-- latest_release -->
<!-- release_rollup since=14.0.202 -->
### Changes since 14.0.202 release
#### Merged Pull Requests
+- Trying to use --recipe-url on Windows with local file fails [#7223](https://github.com/chef/chef/pull/7223) ([tyler-ball](https://github.com/tyler-ball)) <!-- 14.1.1 -->
- [MSYS-752] windows task rewrite using win32-taskscheduler [#6815](https://github.com/chef/chef/pull/6815) ([Vasu1105](https://github.com/Vasu1105)) <!-- 14.0.218 -->
- Allow specifying `ignore_failure :quiet` to disable the error spew [#7194](https://github.com/chef/chef/pull/7194) ([coderanger](https://github.com/coderanger)) <!-- 14.0.217 -->
- Don&#39;t always request lazy files [#7208](https://github.com/chef/chef/pull/7208) ([thommay](https://github.com/thommay)) <!-- 14.0.216 -->
diff --git a/Gemfile.lock b/Gemfile.lock
index cb16dc175f..0cc3ab7f76 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -15,10 +15,10 @@ GIT
PATH
remote: .
specs:
- chef (14.0.218)
+ chef (14.1.1)
addressable
bundler (>= 1.10)
- chef-config (= 14.0.218)
+ chef-config (= 14.1.1)
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.0.218-universal-mingw32)
+ chef (14.1.1-universal-mingw32)
addressable
bundler (>= 1.10)
- chef-config (= 14.0.218)
+ chef-config (= 14.1.1)
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.0.218)
+ chef-config (14.1.1)
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.4)
+ mixlib-archive (0.4.5)
mixlib-log
mixlib-authentication (2.0.0)
mixlib-cli (1.7.0)
diff --git a/VERSION b/VERSION
index 7b3b6e02bb..e199ade4b1 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-14.1.0
+14.1.1 \ 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 491ac6fcd4..40774d189f 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.218"
+ VERSION = "14.1.1"
end
#
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index 3bbf2337a1..572e2f9ef4 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.218")
+ VERSION = Chef::VersionString.new("14.1.1")
end
#