summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChef Expeditor <eng-services-ops+chef-ci@chef.io>2018-02-01 10:07:57 +0000
committerChef Expeditor <eng-services-ops+chef-ci@chef.io>2018-02-01 10:07:57 +0000
commit75f1d2c8836a10ca5d2e427df465111c5351b3b6 (patch)
treeeb8b96a555efe4772cd42f761d1e59f1ac5a1ad0
parent3641723ca6ae24c6a87256b02244ead376553fca (diff)
downloadchef-75f1d2c8836a10ca5d2e427df465111c5351b3b6.tar.gz
Bump version to 14.0.43 by Expeditorv14.0.43
-rw-r--r--CHANGELOG.md7
-rw-r--r--Gemfile.lock14
-rw-r--r--VERSION2
-rw-r--r--chef-config/lib/chef-config/version.rb2
-rw-r--r--lib/chef/version.rb2
5 files changed, 14 insertions, 13 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1953bb445a..4be8c0d1ad 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.42 -->
-## [v14.0.42](https://github.com/chef/chef/tree/v14.0.42) (2018-01-30)
+<!-- latest_release 14.0.43 -->
+## [v14.0.43](https://github.com/chef/chef/tree/v14.0.43) (2018-02-01)
#### Merged Pull Requests
-- Update /etc/fstab on FreeBSD #4959 [#6782](https://github.com/chef/chef/pull/6782) ([cramaechi](https://github.com/cramaechi))
+- Avoid dpkg prompts for modified config files [#6810](https://github.com/chef/chef/pull/6810) ([thommay](https://github.com/thommay))
<!-- latest_release -->
<!-- release_rollup since=13.7.16 -->
### Changes since 13.7.16 release
#### Merged Pull Requests
+- Avoid dpkg prompts for modified config files [#6810](https://github.com/chef/chef/pull/6810) ([thommay](https://github.com/thommay)) <!-- 14.0.43 -->
- Update /etc/fstab on FreeBSD #4959 [#6782](https://github.com/chef/chef/pull/6782) ([cramaechi](https://github.com/cramaechi)) <!-- 14.0.42 -->
- Remove the spec for epic_fail [#6809](https://github.com/chef/chef/pull/6809) ([tas50](https://github.com/tas50)) <!-- 14.0.41 -->
- Fix Appveyor testing: the format of this flametest doesn&#39;t matter [#6808](https://github.com/chef/chef/pull/6808) ([lamont-granquist](https://github.com/lamont-granquist)) <!-- 14.0.40 -->
diff --git a/Gemfile.lock b/Gemfile.lock
index 3f21809ff1..841b14264c 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -8,7 +8,7 @@ GIT
GIT
remote: https://github.com/chef/ohai.git
- revision: d94628d68580709a58fdb742e171ccca1b0fb2a4
+ revision: 849a4caf9926a4e11f12f9175b6f4dcd8a9ccaf1
branch: master
specs:
ohai (14.0.1)
@@ -35,10 +35,10 @@ GIT
PATH
remote: .
specs:
- chef (14.0.42)
+ chef (14.0.43)
addressable
bundler (>= 1.10)
- chef-config (= 14.0.42)
+ chef-config (= 14.0.43)
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.42-universal-mingw32)
+ chef (14.0.43-universal-mingw32)
addressable
bundler (>= 1.10)
- chef-config (= 14.0.42)
+ chef-config (= 14.0.43)
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.42)
+ chef-config (14.0.43)
addressable
fuzzyurl
mixlib-config (~> 2.0)
@@ -262,7 +262,7 @@ GEM
pusher-client (0.6.2)
json
websocket (~> 1.0)
- rack (2.0.3)
+ rack (2.0.4)
rainbow (2.2.2)
rake
rake (12.3.0)
diff --git a/VERSION b/VERSION
index a3a4f48d6d..9988d14e16 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-14.0.42 \ No newline at end of file
+14.0.43 \ 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 bd1e635016..cb756c3e7b 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.42"
+ VERSION = "14.0.43"
end
#
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index 13c1c109b3..36e1568bf5 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.42")
+ VERSION = Chef::VersionString.new("14.0.43")
end
#