diff options
| author | Chef Expeditor <eng-services-ops+chef-ci@chef.io> | 2017-11-23 10:08:27 +0000 |
|---|---|---|
| committer | Chef Expeditor <eng-services-ops+chef-ci@chef.io> | 2017-11-23 10:08:27 +0000 |
| commit | 3eeff76b7d6e5b323a71fcaeb91642fa6e35c40e (patch) | |
| tree | 89dd0086bd218bad9201ca3c0ec4f42b952a8862 | |
| parent | 928e05f9ba841555f62b86ccee687bd3350d7518 (diff) | |
| download | chef-3eeff76b7d6e5b323a71fcaeb91642fa6e35c40e.tar.gz | |
Bump version to 13.6.14 by Expeditorv13.6.14
| -rw-r--r-- | CHANGELOG.md | 7 | ||||
| -rw-r--r-- | Gemfile.lock | 10 | ||||
| -rw-r--r-- | VERSION | 2 | ||||
| -rw-r--r-- | chef-config/lib/chef-config/version.rb | 2 | ||||
| -rw-r--r-- | lib/chef/version.rb | 2 |
5 files changed, 12 insertions, 11 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 15fc1c17c0..ceaf653e7b 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.13 --> -## [v13.6.13](https://github.com/chef/chef/tree/v13.6.13) (2017-11-22) +<!-- latest_release 13.6.14 --> +## [v13.6.14](https://github.com/chef/chef/tree/v13.6.14) (2017-11-23) #### Merged Pull Requests -- Switch from the Travis container to the VM [#6600](https://github.com/chef/chef/pull/6600) ([btm](https://github.com/btm)) +- Selinux shellout fix (#6346) [#6567](https://github.com/chef/chef/pull/6567) ([deltamualpha](https://github.com/deltamualpha)) <!-- latest_release --> <!-- release_rollup since=13.6.4 --> ### Changes since 13.6.4 release #### Merged Pull Requests +- Selinux shellout fix (#6346) [#6567](https://github.com/chef/chef/pull/6567) ([deltamualpha](https://github.com/deltamualpha)) <!-- 13.6.14 --> - Switch from the Travis container to the VM [#6600](https://github.com/chef/chef/pull/6600) ([btm](https://github.com/btm)) <!-- 13.6.13 --> - Don't try to uninstall bundler on appveyor [#6597](https://github.com/chef/chef/pull/6597) ([btm](https://github.com/btm)) <!-- 13.6.12 --> - Fix variable name in solaris service provider [#6596](https://github.com/chef/chef/pull/6596) ([jaymalasinha](https://github.com/jaymalasinha)) <!-- 13.6.11 --> diff --git a/Gemfile.lock b/Gemfile.lock index 7de122707f..7a1054edcf 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -17,10 +17,10 @@ GIT PATH remote: . specs: - chef (13.6.13) + chef (13.6.14) addressable bundler (>= 1.10) - chef-config (= 13.6.13) + chef-config (= 13.6.14) 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.13-universal-mingw32) + chef (13.6.14-universal-mingw32) addressable bundler (>= 1.10) - chef-config (= 13.6.13) + chef-config (= 13.6.14) 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.13) + chef-config (13.6.14) addressable fuzzyurl mixlib-config (~> 2.0) @@ -1 +1 @@ -13.6.13
\ No newline at end of file +13.6.14
\ 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 ecfbe2ded7..f5ea658ccd 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.13" + VERSION = "13.6.14" end # diff --git a/lib/chef/version.rb b/lib/chef/version.rb index 3b59ba64bb..090ef60a29 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.13") + VERSION = Chef::VersionString.new("13.6.14") end # |