diff options
| author | Chef Expeditor <eng-services-ops+chef-ci@chef.io> | 2017-07-27 21:58:58 +0000 |
|---|---|---|
| committer | Chef Expeditor <eng-services-ops+chef-ci@chef.io> | 2017-07-27 21:58:58 +0000 |
| commit | 66091a5e4fd9f8a8ff335310ee327dc8e6ca1db4 (patch) | |
| tree | 197980aaeda66dd8bda6773c4648f298d59def7f | |
| parent | 21db74bf154b839edf0ee0ab2363e50bee4377a6 (diff) | |
| download | chef-66091a5e4fd9f8a8ff335310ee327dc8e6ca1db4.tar.gz | |
Bump version to 13.3.29 by Chef Expeditorv13.3.29
| -rw-r--r-- | CHANGELOG.md | 5 | ||||
| -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, 11 insertions, 10 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index a6d3050fc1..5ec6f12cf2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,14 +1,15 @@ <!-- latest_release --> -## [v13.3.28](https://github.com/chef/chef/tree/v13.3.28) (2017-07-27) +## [v13.3.29](https://github.com/chef/chef/tree/v13.3.29) (2017-07-27) #### Merged Pull Requests -- Update Expeditor config to use new Merge and Artifact Actions [#6287](https://github.com/chef/chef/pull/6287) ([tduffield](https://github.com/tduffield)) +- Apt: Add apt_preference resource from apt cookbooks [#5529](https://github.com/chef/chef/pull/5529) ([tas50](https://github.com/tas50)) <!-- latest_release --> <!-- release_rollup since=13.2.20 --> ### Changes since 13.2.20 release #### Merged Pull Requests +- Apt: Add apt_preference resource from apt cookbooks [#5529](https://github.com/chef/chef/pull/5529) ([tas50](https://github.com/tas50)) <!-- 13.3.29 --> - Update Expeditor config to use new Merge and Artifact Actions [#6287](https://github.com/chef/chef/pull/6287) ([tduffield](https://github.com/tduffield)) <!-- 13.3.28 --> <!-- release_rollup --> diff --git a/Gemfile.lock b/Gemfile.lock index f49bae24fa..b0da8b36fa 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -17,10 +17,10 @@ GIT PATH remote: . specs: - chef (13.3.28) + chef (13.3.29) addressable bundler (>= 1.10) - chef-config (= 13.3.28) + chef-config (= 13.3.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.3.28-universal-mingw32) + chef (13.3.29-universal-mingw32) addressable bundler (>= 1.10) - chef-config (= 13.3.28) + chef-config (= 13.3.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.3.28) + chef-config (13.3.29) addressable fuzzyurl mixlib-config (~> 2.0) @@ -1 +1 @@ -13.3.28
\ No newline at end of file +13.3.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 11f47af5d0..166e614221 100644 --- a/chef-config/lib/chef-config/version.rb +++ b/chef-config/lib/chef-config/version.rb @@ -20,7 +20,7 @@ module ChefConfig CHEFCONFIG_ROOT = File.expand_path("../..", __FILE__) - VERSION = "13.3.28" + VERSION = "13.3.29" end # diff --git a/lib/chef/version.rb b/lib/chef/version.rb index 657b79cd71..3396e648e8 100644 --- a/lib/chef/version.rb +++ b/lib/chef/version.rb @@ -22,7 +22,7 @@ require "chef/version_string" class Chef CHEF_ROOT = File.expand_path("../..", __FILE__) - VERSION = Chef::VersionString.new("13.3.28") + VERSION = Chef::VersionString.new("13.3.29") end # |