summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChef Expeditor <eng-services-ops+chef-ci@chef.io>2018-08-24 02:49:14 +0000
committerChef Expeditor <eng-services-ops+chef-ci@chef.io>2018-08-24 02:49:14 +0000
commit8d393010ccdd1589b4d7255c6910501c7501d031 (patch)
treef88ae9c63acf1ba1ef643dc82cab6dec6c6d08ff
parent68c738f1b3e4d90a8b2c09c0cc049ac0c23f2125 (diff)
downloadchef-8d393010ccdd1589b4d7255c6910501c7501d031.tar.gz
Bump version to 14.4.48 by Chef Expeditorv14.4.48
-rw-r--r--CHANGELOG.md7
-rw-r--r--Gemfile.lock10
-rw-r--r--VERSION2
-rw-r--r--chef-config/lib/chef-config/version.rb2
-rw-r--r--lib/chef/version.rb2
5 files changed, 12 insertions, 11 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2382ce57fe..2b5145358a 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.47 -->
-## [v14.4.47](https://github.com/chef/chef/tree/v14.4.47) (2018-08-23)
+<!-- latest_release 14.4.48 -->
+## [v14.4.48](https://github.com/chef/chef/tree/v14.4.48) (2018-08-24)
#### Merged Pull Requests
-- Modernize our Rakefile / Version bumping system [#7574](https://github.com/chef/chef/pull/7574) ([tas50](https://github.com/tas50))
+- Fix rake task to build the correct gemspec on Chef [#7579](https://github.com/chef/chef/pull/7579) ([tas50](https://github.com/tas50))
<!-- latest_release -->
<!-- release_rollup since=14.3.37 -->
### Changes since 14.3.37 release
#### Merged Pull Requests
+- Fix rake task to build the correct gemspec on Chef [#7579](https://github.com/chef/chef/pull/7579) ([tas50](https://github.com/tas50)) <!-- 14.4.48 -->
- 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 -->
diff --git a/Gemfile.lock b/Gemfile.lock
index 4c8fa72d76..21b49b6c46 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -9,10 +9,10 @@ GIT
PATH
remote: .
specs:
- chef (14.4.47)
+ chef (14.4.48)
addressable
bundler (>= 1.10)
- chef-config (= 14.4.47)
+ chef-config (= 14.4.48)
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.47-universal-mingw32)
+ chef (14.4.48-universal-mingw32)
addressable
bundler (>= 1.10)
- chef-config (= 14.4.47)
+ chef-config (= 14.4.48)
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.47)
+ chef-config (14.4.48)
addressable
fuzzyurl
mixlib-config (>= 2.2.12, < 3.0)
diff --git a/VERSION b/VERSION
index 3eeaa55f4e..fc237c4aed 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-14.4.47 \ No newline at end of file
+14.4.48 \ 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 a93b01d794..d2de7142c1 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.47".freeze
+ VERSION = "14.4.48".freeze
end
#
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index a3cc03716e..251ccd54b9 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.47")
+ VERSION = Chef::VersionString.new("14.4.48")
end
#