summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChef Expeditor <eng-services-ops+chef-ci@chef.io>2017-12-10 11:07:01 +0000
committerChef Expeditor <eng-services-ops+chef-ci@chef.io>2017-12-10 11:07:01 +0000
commit35eac8934a51d86bf9e12131b40148642d0b06cf (patch)
treebc0562937e0173bcbb681df9250550cd538ff8d3
parent73b2128f6d980c3632fb6bd33931ebef261f61e9 (diff)
downloadchef-35eac8934a51d86bf9e12131b40148642d0b06cf.tar.gz
Bump version to 13.6.31 by Expeditorv13.6.31
-rw-r--r--CHANGELOG.md7
-rw-r--r--Gemfile.lock12
-rw-r--r--VERSION2
-rw-r--r--chef-config/lib/chef-config/version.rb2
-rw-r--r--lib/chef/version.rb2
5 files changed, 13 insertions, 12 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 19016a2df7..1e94da967b 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.30 -->
-## [v13.6.30](https://github.com/chef/chef/tree/v13.6.30) (2017-12-08)
+<!-- latest_release 13.6.31 -->
+## [v13.6.31](https://github.com/chef/chef/tree/v13.6.31) (2017-12-10)
#### Merged Pull Requests
-- windows_task: Add additional input validation to properties [#6628](https://github.com/chef/chef/pull/6628) ([tas50](https://github.com/tas50))
+- Ensure data bags names can contain reserved words [#6636](https://github.com/chef/chef/pull/6636) ([EmFl](https://github.com/EmFl))
<!-- latest_release -->
<!-- release_rollup since=13.6.4 -->
### Changes since 13.6.4 release
#### Merged Pull Requests
+- Ensure data bags names can contain reserved words [#6636](https://github.com/chef/chef/pull/6636) ([EmFl](https://github.com/EmFl)) <!-- 13.6.31 -->
- windows_task: Add additional input validation to properties [#6628](https://github.com/chef/chef/pull/6628) ([tas50](https://github.com/tas50)) <!-- 13.6.30 -->
- 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 -->
diff --git a/Gemfile.lock b/Gemfile.lock
index 6a8a6daa5c..dd375d8409 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -17,10 +17,10 @@ GIT
PATH
remote: .
specs:
- chef (13.6.30)
+ chef (13.6.31)
addressable
bundler (>= 1.10)
- chef-config (= 13.6.30)
+ chef-config (= 13.6.31)
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.30-universal-mingw32)
+ chef (13.6.31-universal-mingw32)
addressable
bundler (>= 1.10)
- chef-config (= 13.6.30)
+ chef-config (= 13.6.31)
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.30)
+ chef-config (13.6.31)
addressable
fuzzyurl
mixlib-config (~> 2.0)
@@ -237,7 +237,7 @@ GEM
parser (2.4.0.2)
ast (~> 2.3)
parslet (1.8.1)
- plist (3.3.0)
+ plist (3.4.0)
powerpack (0.1.1)
proxifier (1.0.3)
pry (0.11.3)
diff --git a/VERSION b/VERSION
index ba1d9f834b..4e23c6ce85 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-13.6.30 \ No newline at end of file
+13.6.31 \ 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 3d039140af..6957649c6e 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.30"
+ VERSION = "13.6.31"
end
#
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index 62c3be7b75..6c11e78644 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.30")
+ VERSION = Chef::VersionString.new("13.6.31")
end
#