summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChef Expeditor <eng-services-ops+chef-ci@chef.io>2018-08-24 05:27:22 +0000
committerChef Expeditor <eng-services-ops+chef-ci@chef.io>2018-08-24 05:27:22 +0000
commita749e76cad7b89ae21ac09f03ea17272ad2ab6dd (patch)
tree582967d21d9bade74d237410317bc70169f19045
parent2fb4f13b3e488d5f5147a09862221bc462f49035 (diff)
downloadchef-a749e76cad7b89ae21ac09f03ea17272ad2ab6dd.tar.gz
Bump version to 14.4.49 by Chef Expeditorv14.4.49
-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 2b5145358a..9bd6eb6a7d 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.48 -->
-## [v14.4.48](https://github.com/chef/chef/tree/v14.4.48) (2018-08-24)
+<!-- latest_release 14.4.49 -->
+## [v14.4.49](https://github.com/chef/chef/tree/v14.4.49) (2018-08-24)
#### 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))
+- Pull in latest omnibus definitions + new inspec/train [#7581](https://github.com/chef/chef/pull/7581) ([tas50](https://github.com/tas50))
<!-- latest_release -->
<!-- release_rollup since=14.3.37 -->
### Changes since 14.3.37 release
#### Merged Pull Requests
+- Pull in latest omnibus definitions + new inspec/train [#7581](https://github.com/chef/chef/pull/7581) ([tas50](https://github.com/tas50)) <!-- 14.4.49 -->
- 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 -->
diff --git a/Gemfile.lock b/Gemfile.lock
index 601fd663bb..8ffc962653 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -9,10 +9,10 @@ GIT
PATH
remote: .
specs:
- chef (14.4.48)
+ chef (14.4.49)
addressable
bundler (>= 1.10)
- chef-config (= 14.4.48)
+ chef-config (= 14.4.49)
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.48-universal-mingw32)
+ chef (14.4.49-universal-mingw32)
addressable
bundler (>= 1.10)
- chef-config (= 14.4.48)
+ chef-config (= 14.4.49)
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.48)
+ chef-config (14.4.49)
addressable
fuzzyurl
mixlib-config (>= 2.2.12, < 3.0)
diff --git a/VERSION b/VERSION
index fc237c4aed..013da1c5f0 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-14.4.48 \ No newline at end of file
+14.4.49 \ 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 d2de7142c1..b0bfd0810b 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.48".freeze
+ VERSION = "14.4.49".freeze
end
#
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index 251ccd54b9..768078fc4b 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.48")
+ VERSION = Chef::VersionString.new("14.4.49")
end
#