summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChef Expeditor <chef-ci@chef.io>2019-07-10 22:41:36 +0000
committerChef Expeditor <chef-ci@chef.io>2019-07-10 22:41:36 +0000
commitf8f88712817c621ff996551223a25ea1d36d6555 (patch)
tree30279aaa6b73b703a096ff03b14f4c5d24af8961
parentc6947163e330dd4e83cb56af748dc84bb98f646d (diff)
downloadchef-f8f88712817c621ff996551223a25ea1d36d6555.tar.gz
Bump version to 15.1.49 by Chef Expeditorv15.1.49
Obvious fix; these changes are the result of automation not creative thinking.
-rw-r--r--CHANGELOG.md7
-rw-r--r--Gemfile.lock14
-rw-r--r--VERSION2
-rw-r--r--chef-bin/lib/chef-bin/version.rb2
-rw-r--r--chef-config/lib/chef-config/version.rb2
-rw-r--r--lib/chef/version.rb2
6 files changed, 15 insertions, 14 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4e554886ca..c29c3821af 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,15 +1,16 @@
<!-- usage documentation: http://expeditor-docs.es.chef.io/configuration/changelog/ -->
-<!-- latest_release 15.1.48 -->
-## [v15.1.48](https://github.com/chef/chef/tree/v15.1.48) (2019-07-10)
+<!-- latest_release 15.1.49 -->
+## [v15.1.49](https://github.com/chef/chef/tree/v15.1.49) (2019-07-10)
#### Merged Pull Requests
-- Remove rspec config for Travis [#8728](https://github.com/chef/chef/pull/8728) ([tas50](https://github.com/tas50))
+- Roll back Rubygems to 3.0.3 to prevent double bundler install [#8736](https://github.com/chef/chef/pull/8736) ([tas50](https://github.com/tas50))
<!-- latest_release -->
<!-- release_rollup since=15.1.36 -->
### Changes not yet released to stable
#### Merged Pull Requests
+- Roll back Rubygems to 3.0.3 to prevent double bundler install [#8736](https://github.com/chef/chef/pull/8736) ([tas50](https://github.com/tas50)) <!-- 15.1.49 -->
- Remove rspec config for Travis [#8728](https://github.com/chef/chef/pull/8728) ([tas50](https://github.com/tas50)) <!-- 15.1.48 -->
- Bump inspec-core to 4.7.3 [#8726](https://github.com/chef/chef/pull/8726) ([chef-ci](https://github.com/chef-ci)) <!-- 15.1.47 -->
- Add examples to the apt_repository resource [#8719](https://github.com/chef/chef/pull/8719) ([tas50](https://github.com/tas50)) <!-- 15.1.46 -->
diff --git a/Gemfile.lock b/Gemfile.lock
index 72a6eedbe8..79bef1c361 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -27,11 +27,11 @@ GIT
PATH
remote: .
specs:
- chef (15.1.48)
+ chef (15.1.49)
addressable
bcrypt_pbkdf (~> 1.0)
bundler (>= 1.10)
- chef-config (= 15.1.48)
+ chef-config (= 15.1.49)
chef-zero (>= 14.0.11)
diff-lcs (~> 1.2, >= 1.2.4)
ed25519 (~> 1.2)
@@ -57,11 +57,11 @@ PATH
train-core (~> 2.0, >= 2.0.12)
tty-screen (~> 0.6)
uuidtools (~> 2.1.5)
- chef (15.1.48-universal-mingw32)
+ chef (15.1.49-universal-mingw32)
addressable
bcrypt_pbkdf (~> 1.0)
bundler (>= 1.10)
- chef-config (= 15.1.48)
+ chef-config (= 15.1.49)
chef-zero (>= 14.0.11)
diff-lcs (~> 1.2, >= 1.2.4)
ed25519 (~> 1.2)
@@ -103,13 +103,13 @@ PATH
PATH
remote: chef-bin
specs:
- chef-bin (15.1.48)
- chef (= 15.1.48)
+ chef-bin (15.1.49)
+ chef (= 15.1.49)
PATH
remote: chef-config
specs:
- chef-config (15.1.48)
+ chef-config (15.1.49)
addressable
fuzzyurl
mixlib-config (>= 2.2.12, < 4.0)
diff --git a/VERSION b/VERSION
index 9da37c5fbc..e95854e03a 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-15.1.48 \ No newline at end of file
+15.1.49 \ No newline at end of file
diff --git a/chef-bin/lib/chef-bin/version.rb b/chef-bin/lib/chef-bin/version.rb
index 5480fbbcb8..a8d107ac0f 100644
--- a/chef-bin/lib/chef-bin/version.rb
+++ b/chef-bin/lib/chef-bin/version.rb
@@ -21,7 +21,7 @@
module ChefBin
CHEFBIN_ROOT = File.expand_path("../..", __FILE__)
- VERSION = "15.1.48".freeze
+ VERSION = "15.1.49".freeze
end
#
diff --git a/chef-config/lib/chef-config/version.rb b/chef-config/lib/chef-config/version.rb
index 95025b7416..ef1bd6b051 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 = "15.1.48".freeze
+ VERSION = "15.1.49".freeze
end
#
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index 11409a3b29..f397e33e5a 100644
--- a/lib/chef/version.rb
+++ b/lib/chef/version.rb
@@ -23,7 +23,7 @@ require_relative "version_string"
class Chef
CHEF_ROOT = File.expand_path("../..", __FILE__)
- VERSION = Chef::VersionString.new("15.1.48")
+ VERSION = Chef::VersionString.new("15.1.49")
end
#