diff options
| author | Thom May <thom@may.lt> | 2017-07-06 10:28:08 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-07-06 10:28:08 +0100 |
| commit | f8b74c7f3b2d2065d0e4c182b1040bdda7617ba6 (patch) | |
| tree | 0dcc8ffa95c00213217500bfa4397a632a1f70b9 | |
| parent | c1a8cfe00daab53c0b9c96e2b759d47aec4af22c (diff) | |
| parent | 10e3e762e9c126a2bd7fc149640021b7ef3a7f4c (diff) | |
| download | chef-f8b74c7f3b2d2065d0e4c182b1040bdda7617ba6.tar.gz | |
Merge pull request #6256 from chef/tm/13_3
Start 13.3
| -rw-r--r-- | .gitignore | 3 | ||||
| -rw-r--r-- | Gemfile.lock | 10 | ||||
| -rw-r--r-- | RELEASE_NOTES.md | 4 | ||||
| -rw-r--r-- | VERSION | 2 | ||||
| -rw-r--r-- | chef-config/lib/chef-config/version.rb | 2 | ||||
| -rw-r--r-- | lib/chef/version.rb | 2 |
6 files changed, 13 insertions, 10 deletions
diff --git a/.gitignore b/.gitignore index 83e7f8cad3..bb2594685a 100644 --- a/.gitignore +++ b/.gitignore @@ -52,3 +52,6 @@ acceptance/bin/* vendor/ acceptance/vendor kitchen-tests/vendor + +# Visual Studio Code files +.vscode diff --git a/Gemfile.lock b/Gemfile.lock index 5dc6aff4da..8efa9e33a5 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -30,10 +30,10 @@ GIT PATH remote: . specs: - chef (13.2.22) + chef (13.3.0) addressable bundler (>= 1.10) - chef-config (= 13.2.22) + chef-config (= 13.3.0) chef-zero (>= 13.0) diff-lcs (~> 1.2, >= 1.2.4) erubis (~> 2.7) @@ -60,10 +60,10 @@ PATH specinfra (~> 2.10) syslog-logger (~> 1.6) uuidtools (~> 2.1.5) - chef (13.2.22-universal-mingw32) + chef (13.3.0-universal-mingw32) addressable bundler (>= 1.10) - chef-config (= 13.2.22) + chef-config (= 13.3.0) chef-zero (>= 13.0) diff-lcs (~> 1.2, >= 1.2.4) erubis (~> 2.7) @@ -105,7 +105,7 @@ PATH PATH remote: chef-config specs: - chef-config (13.2.22) + chef-config (13.3.0) addressable fuzzyurl mixlib-config (~> 2.0) diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md index 2d1444c40a..bd52f579ed 100644 --- a/RELEASE_NOTES.md +++ b/RELEASE_NOTES.md @@ -1,8 +1,8 @@ _This file holds "in progress" release notes for the current release under development and is intended for consumption by the Chef Documentation team. Please see <https://docs.chef.io/release_notes.html> for the official Chef release notes._ -# Chef Client Release Notes +# Chef Client Release Notes 13.3: -# 13.2 +# Chef Client Release Notes 13.2: ## Properly send policyfile data @@ -1 +1 @@ -13.2.22
\ No newline at end of file +13.3.0
\ 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 7665c4ed94..157ca9b885 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.2.22" + VERSION = "13.3.0" end # diff --git a/lib/chef/version.rb b/lib/chef/version.rb index bd5874354b..b4db8f5a40 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.2.22") + VERSION = Chef::VersionString.new("13.3.0") end # |