summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChef Expeditor <eng-services-ops+chef-ci@chef.io>2018-08-23 18:21:27 +0000
committerChef Expeditor <eng-services-ops+chef-ci@chef.io>2018-08-23 18:21:27 +0000
commite7d4d2c7cdb7512f669bf282492b41dc269f6c16 (patch)
tree4f1e33e084bf32c176844d828756bfe9b7caf161
parent1322a9be9bf696adf84a50d6127d8bc6ccde9de6 (diff)
downloadchef-e7d4d2c7cdb7512f669bf282492b41dc269f6c16.tar.gz
Bump version to 14.4.47 by Chef Expeditorv14.4.47
-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 64c5907cdf..2382ce57fe 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,15 +1,16 @@
<!-- usage documentation: http://expeditor-docs.es.chef.io/configuration/changelog/ -->
-<!-- latest_release 14.4.46 -->
-## [v14.4.46](https://github.com/chef/chef/tree/v14.4.46) (2018-08-22)
+<!-- latest_release 14.4.47 -->
+## [v14.4.47](https://github.com/chef/chef/tree/v14.4.47) (2018-08-23)
#### Merged Pull Requests
-- lazy the default resource_name until after parsing [#7566](https://github.com/chef/chef/pull/7566) ([lamont-granquist](https://github.com/lamont-granquist))
+- Modernize our Rakefile / Version bumping system [#7574](https://github.com/chef/chef/pull/7574) ([tas50](https://github.com/tas50))
<!-- latest_release -->
<!-- release_rollup since=14.3.37 -->
### Changes since 14.3.37 release
#### Merged Pull Requests
+- Modernize our Rakefile / Version bumping system [#7574](https://github.com/chef/chef/pull/7574) ([tas50](https://github.com/tas50)) <!-- 14.4.47 -->
- lazy the default resource_name until after parsing [#7566](https://github.com/chef/chef/pull/7566) ([lamont-granquist](https://github.com/lamont-granquist)) <!-- 14.4.46 -->
- Update to Ohai 14.4.2 [#7570](https://github.com/chef/chef/pull/7570) ([tas50](https://github.com/tas50)) <!-- 14.4.45 -->
- switch shell_out to shell_out! in func tests [#7565](https://github.com/chef/chef/pull/7565) ([lamont-granquist](https://github.com/lamont-granquist)) <!-- 14.4.44 -->
diff --git a/Gemfile.lock b/Gemfile.lock
index db9cf82131..4c8fa72d76 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -9,10 +9,10 @@ GIT
PATH
remote: .
specs:
- chef (14.4.46)
+ chef (14.4.47)
addressable
bundler (>= 1.10)
- chef-config (= 14.4.46)
+ chef-config (= 14.4.47)
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.4.46-universal-mingw32)
+ chef (14.4.47-universal-mingw32)
addressable
bundler (>= 1.10)
- chef-config (= 14.4.46)
+ chef-config (= 14.4.47)
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.4.46)
+ chef-config (14.4.47)
addressable
fuzzyurl
mixlib-config (>= 2.2.12, < 3.0)
@@ -289,7 +289,7 @@ GEM
simplecov-html (~> 0.10.0)
simplecov-html (0.10.2)
slop (3.6.0)
- specinfra (2.76.0)
+ specinfra (2.76.1)
net-scp
net-ssh (>= 2.7)
net-telnet
diff --git a/VERSION b/VERSION
index 5380855e0f..3eeaa55f4e 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-14.4.46 \ No newline at end of file
+14.4.47 \ 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 24228b1091..a93b01d794 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.4.46".freeze
+ VERSION = "14.4.47".freeze
end
#
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index 160fd52cf6..a3cc03716e 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.4.46")
+ VERSION = Chef::VersionString.new("14.4.47")
end
#