summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChef Expeditor <eng-services-ops+chef-ci@chef.io>2018-02-07 10:30:03 +0000
committerChef Expeditor <eng-services-ops+chef-ci@chef.io>2018-02-07 10:30:03 +0000
commit5b6076f292b6b81fef2a4d83213d475abb379921 (patch)
tree662987e3d312532ebddfb7808cf680b53da097f7
parenta55fd7ca0f32c4d6e39431014263938ac4b10504 (diff)
downloadchef-14.0.46.tar.gz
Bump version to 14.0.46 by Expeditorv14.0.46
-rw-r--r--CHANGELOG.md7
-rw-r--r--Gemfile.lock18
-rw-r--r--VERSION2
-rw-r--r--chef-config/lib/chef-config/version.rb2
-rw-r--r--lib/chef/version.rb2
5 files changed, 16 insertions, 15 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1fadab66ec..91b2e33ab9 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.45 -->
-## [v14.0.45](https://github.com/chef/chef/tree/v14.0.45) (2018-02-06)
+<!-- latest_release 14.0.46 -->
+## [v14.0.46](https://github.com/chef/chef/tree/v14.0.46) (2018-02-07)
#### Merged Pull Requests
-- Remove testing of Debian 7 as it&#39;s going EOL [#6826](https://github.com/chef/chef/pull/6826) ([tas50](https://github.com/tas50))
+- Fix windows_task idle_time validation [#6807](https://github.com/chef/chef/pull/6807) ([algaut](https://github.com/algaut))
<!-- latest_release -->
<!-- release_rollup since=13.7.16 -->
### Changes since 13.7.16 release
#### Merged Pull Requests
+- Fix windows_task idle_time validation [#6807](https://github.com/chef/chef/pull/6807) ([algaut](https://github.com/algaut)) <!-- 14.0.46 -->
- Remove testing of Debian 7 as it&#39;s going EOL [#6826](https://github.com/chef/chef/pull/6826) ([tas50](https://github.com/tas50)) <!-- 14.0.45 -->
- guard against somehow being called by the package resource [#6820](https://github.com/chef/chef/pull/6820) ([thommay](https://github.com/thommay)) <!-- 14.0.44 -->
- Avoid dpkg prompts for modified config files [#6810](https://github.com/chef/chef/pull/6810) ([thommay](https://github.com/thommay)) <!-- 14.0.43 -->
diff --git a/Gemfile.lock b/Gemfile.lock
index e081224821..be03c6c0cd 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -35,10 +35,10 @@ GIT
PATH
remote: .
specs:
- chef (14.0.45)
+ chef (14.0.46)
addressable
bundler (>= 1.10)
- chef-config (= 14.0.45)
+ chef-config (= 14.0.46)
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.45-universal-mingw32)
+ chef (14.0.46-universal-mingw32)
addressable
bundler (>= 1.10)
- chef-config (= 14.0.45)
+ chef-config (= 14.0.46)
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.45)
+ chef-config (14.0.46)
addressable
fuzzyurl
mixlib-config (~> 2.0)
@@ -156,9 +156,9 @@ GEM
multipart-post (>= 1.2, < 3)
faraday_middleware (0.12.2)
faraday (>= 0.7.4, < 1.0)
- ffi (1.9.18)
- ffi (1.9.18-x64-mingw32)
- ffi (1.9.18-x86-mingw32)
+ ffi (1.9.21)
+ ffi (1.9.21-x64-mingw32)
+ ffi (1.9.21-x86-mingw32)
ffi-win32-extensions (1.0.3)
ffi
ffi-yajl (2.3.1)
@@ -315,7 +315,7 @@ GEM
simplecov-html (~> 0.10.0)
simplecov-html (0.10.2)
slop (3.6.0)
- specinfra (2.73.1)
+ specinfra (2.73.2)
net-scp
net-ssh (>= 2.7, < 5.0)
net-telnet
diff --git a/VERSION b/VERSION
index c3271fd45b..90a4814a47 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-14.0.45 \ No newline at end of file
+14.0.46 \ 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 93e21e78fb..a30ce71ea2 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.45"
+ VERSION = "14.0.46"
end
#
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index 0f5138545f..f42c0cad7f 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.45")
+ VERSION = Chef::VersionString.new("14.0.46")
end
#