summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChef Expeditor <chef-ci@chef.io>2019-07-10 22:17:29 +0000
committerChef Expeditor <chef-ci@chef.io>2019-07-10 22:17:29 +0000
commit742412f6eed9f288d536a8dc3509d7bc58f5dccb (patch)
tree6a0b8f344ae33b125e8a17e9f1ff33f33b7a5cee
parent063c046a4e5ea2727a64a122acedbb79948a5dd6 (diff)
downloadchef-742412f6eed9f288d536a8dc3509d7bc58f5dccb.tar.gz
Bump version to 15.1.47 by Chef Expeditorv15.1.47
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 4e708ba978..c30d92c324 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.46 -->
-## [v15.1.46](https://github.com/chef/chef/tree/v15.1.46) (2019-07-09)
+<!-- latest_release 15.1.47 -->
+## [v15.1.47](https://github.com/chef/chef/tree/v15.1.47) (2019-07-10)
#### Merged Pull Requests
-- Add examples to the apt_repository resource [#8719](https://github.com/chef/chef/pull/8719) ([tas50](https://github.com/tas50))
+- Bump inspec-core to 4.7.3 [#8726](https://github.com/chef/chef/pull/8726) ([chef-ci](https://github.com/chef-ci))
<!-- latest_release -->
<!-- release_rollup since=15.1.36 -->
### Changes not yet released to stable
#### Merged Pull Requests
+- 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 -->
- More Chefstyle updates [#8711](https://github.com/chef/chef/pull/8711) ([lamont-granquist](https://github.com/lamont-granquist)) <!-- 15.1.45 -->
- fix Layout/AlignArguments [#8708](https://github.com/chef/chef/pull/8708) ([lamont-granquist](https://github.com/lamont-granquist)) <!-- 15.1.44 -->
diff --git a/Gemfile.lock b/Gemfile.lock
index 941467780f..5c30da1766 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -27,11 +27,11 @@ GIT
PATH
remote: .
specs:
- chef (15.1.46)
+ chef (15.1.47)
addressable
bcrypt_pbkdf (~> 1.0)
bundler (>= 1.10)
- chef-config (= 15.1.46)
+ chef-config (= 15.1.47)
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.46-universal-mingw32)
+ chef (15.1.47-universal-mingw32)
addressable
bcrypt_pbkdf (~> 1.0)
bundler (>= 1.10)
- chef-config (= 15.1.46)
+ chef-config (= 15.1.47)
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.46)
- chef (= 15.1.46)
+ chef-bin (15.1.47)
+ chef (= 15.1.47)
PATH
remote: chef-config
specs:
- chef-config (15.1.46)
+ chef-config (15.1.47)
addressable
fuzzyurl
mixlib-config (>= 2.2.12, < 4.0)
diff --git a/VERSION b/VERSION
index 0061b51870..095a772e32 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-15.1.46 \ No newline at end of file
+15.1.47 \ 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 45ec78da58..c94941a388 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.46".freeze
+ VERSION = "15.1.47".freeze
end
#
diff --git a/chef-config/lib/chef-config/version.rb b/chef-config/lib/chef-config/version.rb
index 5468e85c9b..02e6509a30 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.46".freeze
+ VERSION = "15.1.47".freeze
end
#
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index e156735b90..cd32b60c5c 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.46")
+ VERSION = Chef::VersionString.new("15.1.47")
end
#