summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChef Expeditor <chef-ci@chef.io>2019-02-22 12:32:35 +0000
committerChef Expeditor <chef-ci@chef.io>2019-02-22 12:32:35 +0000
commit22e195ac758c4a11af903a8e2d6af6c81bc11319 (patch)
treeb198fd26e45fcc11c52f22aaf1c7645e9cbada6a
parentcfb841dfb8c4c51cba0ca26c6bab26f0a687e48a (diff)
downloadchef-22e195ac758c4a11af903a8e2d6af6c81bc11319.tar.gz
Bump version to 15.0.170 by Chef Expeditorv15.0.170
Obvious fix; these changes are the result of automation not creative thinking.
-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 2ab9d31f4a..b630564731 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,15 +1,16 @@
<!-- usage documentation: http://expeditor-docs.es.chef.io/configuration/changelog/ -->
-<!-- latest_release 15.0.169 -->
-## [v15.0.169](https://github.com/chef/chef/tree/v15.0.169) (2019-02-21)
+<!-- latest_release 15.0.170 -->
+## [v15.0.170](https://github.com/chef/chef/tree/v15.0.170) (2019-02-22)
#### Merged Pull Requests
-- pin rbnacl to 5.x [#8244](https://github.com/chef/chef/pull/8244) ([lamont-granquist](https://github.com/lamont-granquist))
+- allow setting mode for openssl_dhparam after creation [#8245](https://github.com/chef/chef/pull/8245) ([btm](https://github.com/btm))
<!-- latest_release -->
<!-- release_rollup -->
### Changes since latest stable release
#### Merged Pull Requests
+- allow setting mode for openssl_dhparam after creation [#8245](https://github.com/chef/chef/pull/8245) ([btm](https://github.com/btm)) <!-- 15.0.170 -->
- pin rbnacl to 5.x [#8244](https://github.com/chef/chef/pull/8244) ([lamont-granquist](https://github.com/lamont-granquist)) <!-- 15.0.169 -->
- add LazyModuleInclude to Universal DSL [#8243](https://github.com/chef/chef/pull/8243) ([lamont-granquist](https://github.com/lamont-granquist)) <!-- 15.0.168 -->
- Update InSpec to 3.6.6 [#8235](https://github.com/chef/chef/pull/8235) ([tas50](https://github.com/tas50)) <!-- 15.0.167 -->
diff --git a/Gemfile.lock b/Gemfile.lock
index 38ee855027..db9b0b797d 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -27,10 +27,10 @@ GIT
PATH
remote: .
specs:
- chef (15.0.169)
+ chef (15.0.170)
addressable
bundler (>= 1.10)
- chef-config (= 15.0.169)
+ chef-config (= 15.0.170)
chef-zero (>= 14.0.11)
diff-lcs (~> 1.2, >= 1.2.4)
erubis (~> 2.7)
@@ -57,10 +57,10 @@ PATH
specinfra (~> 2.10)
syslog-logger (~> 1.6)
uuidtools (~> 2.1.5)
- chef (15.0.169-universal-mingw32)
+ chef (15.0.170-universal-mingw32)
addressable
bundler (>= 1.10)
- chef-config (= 15.0.169)
+ chef-config (= 15.0.170)
chef-zero (>= 14.0.11)
diff-lcs (~> 1.2, >= 1.2.4)
erubis (~> 2.7)
@@ -104,7 +104,7 @@ PATH
PATH
remote: chef-config
specs:
- chef-config (15.0.169)
+ chef-config (15.0.170)
addressable
fuzzyurl
mixlib-config (>= 2.2.12, < 3.0)
diff --git a/VERSION b/VERSION
index c862376c1d..8016f8b958 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-15.0.169 \ No newline at end of file
+15.0.170 \ 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 87cd56fd24..1ea529cced 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.0.169".freeze
+ VERSION = "15.0.170".freeze
end
#
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index 69f80b074d..a8a7a20bb0 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("15.0.169")
+ VERSION = Chef::VersionString.new("15.0.170")
end
#