summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChef Expeditor <eng-services-ops+chef-ci@chef.io>2017-12-08 11:42:57 +0000
committerChef Expeditor <eng-services-ops+chef-ci@chef.io>2017-12-08 11:42:57 +0000
commitbcdb1efcb33c580c89a96b50688d6872741ed7ae (patch)
tree0915c8278662ce21a7e8dbceab82199fe9eca99d
parent1bcb012aa0905c055730972f1cab17cbbb4daf7c (diff)
downloadchef-bcdb1efcb33c580c89a96b50688d6872741ed7ae.tar.gz
Bump version to 13.6.29 by Expeditorv13.6.29
-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 6a78ac6865..faf4275824 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,15 +1,16 @@
<!-- usage documentation: http://expeditor-docs.es.chef.io/configuration/changelog/ -->
-<!-- latest_release 13.6.28 -->
-## [v13.6.28](https://github.com/chef/chef/tree/v13.6.28) (2017-12-08)
+<!-- latest_release 13.6.29 -->
+## [v13.6.29](https://github.com/chef/chef/tree/v13.6.29) (2017-12-08)
#### Merged Pull Requests
-- speedup node_map get and set operations [#6632](https://github.com/chef/chef/pull/6632) ([lamont-granquist](https://github.com/lamont-granquist))
+- Solaris: Fix svcadm clear to only run in maintenance state [#6631](https://github.com/chef/chef/pull/6631) ([jaymalasinha](https://github.com/jaymalasinha))
<!-- latest_release -->
<!-- release_rollup since=13.6.4 -->
### Changes since 13.6.4 release
#### Merged Pull Requests
+- Solaris: Fix svcadm clear to only run in maintenance state [#6631](https://github.com/chef/chef/pull/6631) ([jaymalasinha](https://github.com/jaymalasinha)) <!-- 13.6.29 -->
- speedup node_map get and set operations [#6632](https://github.com/chef/chef/pull/6632) ([lamont-granquist](https://github.com/lamont-granquist)) <!-- 13.6.28 -->
- Update for openssl 1.0.2n and inspec 1.48 [#6630](https://github.com/chef/chef/pull/6630) ([tas50](https://github.com/tas50)) <!-- 13.6.27 -->
- Improved windows_task logging [#6617](https://github.com/chef/chef/pull/6617) ([tas50](https://github.com/tas50)) <!-- 13.6.26 -->
diff --git a/Gemfile.lock b/Gemfile.lock
index bc1a332d67..4b96823402 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -17,10 +17,10 @@ GIT
PATH
remote: .
specs:
- chef (13.6.28)
+ chef (13.6.29)
addressable
bundler (>= 1.10)
- chef-config (= 13.6.28)
+ chef-config (= 13.6.29)
chef-zero (>= 13.0)
diff-lcs (~> 1.2, >= 1.2.4)
erubis (~> 2.7)
@@ -47,10 +47,10 @@ PATH
specinfra (~> 2.10)
syslog-logger (~> 1.6)
uuidtools (~> 2.1.5)
- chef (13.6.28-universal-mingw32)
+ chef (13.6.29-universal-mingw32)
addressable
bundler (>= 1.10)
- chef-config (= 13.6.28)
+ chef-config (= 13.6.29)
chef-zero (>= 13.0)
diff-lcs (~> 1.2, >= 1.2.4)
erubis (~> 2.7)
@@ -92,7 +92,7 @@ PATH
PATH
remote: chef-config
specs:
- chef-config (13.6.28)
+ chef-config (13.6.29)
addressable
fuzzyurl
mixlib-config (~> 2.0)
diff --git a/VERSION b/VERSION
index 8485cd9927..1e8de91637 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-13.6.28 \ No newline at end of file
+13.6.29 \ 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 28f2d655de..1743e6ad3b 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 = "13.6.28"
+ VERSION = "13.6.29"
end
#
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index fad35daaab..f977425069 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("13.6.28")
+ VERSION = Chef::VersionString.new("13.6.29")
end
#