diff options
| -rw-r--r-- | .expeditor/update_dep.sh | 2 | ||||
| -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 | ||||
| -rw-r--r-- | omnibus/Gemfile.lock | 42 |
7 files changed, 34 insertions, 33 deletions
diff --git a/.expeditor/update_dep.sh b/.expeditor/update_dep.sh index 13cc63ccc0..a27df411d5 100644 --- a/.expeditor/update_dep.sh +++ b/.expeditor/update_dep.sh @@ -5,7 +5,7 @@ set -evx branch="expeditor/${GEM_NAME}_${VERSION}" git checkout -b "$branch" -bundle update $GEM_NAME -v $VERSION +bundle update $GEM_NAME git add . git commit --message "Bump $GEM_NAME to $VERSION" --message "This pull request was triggered automatically via Expeditor when $GEM_NAME $VERSION was promoted to Rubygems." diff --git a/CHANGELOG.md b/CHANGELOG.md index 4358a69320..f06edc456c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,15 +1,16 @@ <!-- usage documentation: http://expeditor-docs.es.chef.io/configuration/changelog/ --> -<!-- latest_release 14.4.27 --> -## [v14.4.27](https://github.com/chef/chef/tree/v14.4.27) (2018-08-08) +<!-- latest_release 14.4.28 --> +## [v14.4.28](https://github.com/chef/chef/tree/v14.4.28) (2018-08-10) #### Merged Pull Requests -- Bump Ohai to 14.4 [#7532](https://github.com/chef/chef/pull/7532) ([tas50](https://github.com/tas50)) +- Update omnibus to 5.6.15 [#7536](https://github.com/chef/chef/pull/7536) ([tas50](https://github.com/tas50)) <!-- latest_release --> <!-- release_rollup since=14.3.37 --> ### Changes since 14.3.37 release #### Merged Pull Requests +- Update omnibus to 5.6.15 [#7536](https://github.com/chef/chef/pull/7536) ([tas50](https://github.com/tas50)) <!-- 14.4.28 --> - Bump Ohai to 14.4 [#7532](https://github.com/chef/chef/pull/7532) ([tas50](https://github.com/tas50)) <!-- 14.4.27 --> - stop parsing init script at the "### END INIT INFO" marker. [#7525](https://github.com/chef/chef/pull/7525) ([goblin23](https://github.com/goblin23)) <!-- 14.4.26 --> - Maybe hold off on rspec 3.8 [#7527](https://github.com/chef/chef/pull/7527) ([cheeseplus](https://github.com/cheeseplus)) <!-- 14.4.25 --> diff --git a/Gemfile.lock b/Gemfile.lock index bb8f2aa9b7..fb8cb9393e 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -9,10 +9,10 @@ GIT PATH remote: . specs: - chef (14.4.27) + chef (14.4.28) addressable bundler (>= 1.10) - chef-config (= 14.4.27) + chef-config (= 14.4.28) chef-zero (>= 13.0) diff-lcs (~> 1.2, >= 1.2.4) erubis (~> 2.7) @@ -40,10 +40,10 @@ PATH specinfra (~> 2.10) syslog-logger (~> 1.6) uuidtools (~> 2.1.5) - chef (14.4.27-universal-mingw32) + chef (14.4.28-universal-mingw32) addressable bundler (>= 1.10) - chef-config (= 14.4.27) + chef-config (= 14.4.28) chef-zero (>= 13.0) diff-lcs (~> 1.2, >= 1.2.4) erubis (~> 2.7) @@ -86,7 +86,7 @@ PATH PATH remote: chef-config specs: - chef-config (14.4.27) + chef-config (14.4.28) addressable fuzzyurl mixlib-config (>= 2.2.12, < 3.0) @@ -1 +1 @@ -14.4.27
\ No newline at end of file +14.4.28
\ 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 b471305c70..43bbaf5bf3 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 = "14.4.27".freeze + VERSION = "14.4.28".freeze end # diff --git a/lib/chef/version.rb b/lib/chef/version.rb index a406421854..f4555742f0 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("14.4.27") + VERSION = Chef::VersionString.new("14.4.28") end # diff --git a/omnibus/Gemfile.lock b/omnibus/Gemfile.lock index 9519ea3589..bfe7f8da17 100644 --- a/omnibus/Gemfile.lock +++ b/omnibus/Gemfile.lock @@ -1,24 +1,24 @@ GIT remote: https://github.com/chef/omnibus - revision: 7e9c9a6a71c1ada2d7f42484f13074e1ec6b7cd3 + revision: 6c242471a79698e5fc7b8d8364dedea3c246ef4a branch: master specs: - omnibus (5.6.12) + omnibus (5.6.15) aws-sdk (~> 2) - chef-sugar (~> 3.3) + chef-sugar (>= 3.3) cleanroom (~> 1.0) ffi-yajl (~> 2.2) license_scout (~> 1.0) mixlib-shellout (~> 2.0) mixlib-versioning - ohai (>= 8.6.0.alpha.1, < 15) + ohai (>= 13, < 15) pedump ruby-progressbar (~> 1.7) thor (~> 0.18) GIT remote: https://github.com/chef/omnibus-software - revision: d48afdf29dd9c9d0562656675d1036cd035c2a46 + revision: 33e91c818a7ddfdb3130d6e407ed289c3c05aca7 branch: master specs: omnibus-software (4.0.0) @@ -31,13 +31,13 @@ GEM addressable (2.5.2) public_suffix (>= 2.0.2, < 4.0) awesome_print (1.8.0) - aws-sdk (2.11.93) - aws-sdk-resources (= 2.11.93) - aws-sdk-core (2.11.93) + aws-sdk (2.11.105) + aws-sdk-resources (= 2.11.105) + aws-sdk-core (2.11.105) aws-sigv4 (~> 1.0) jmespath (~> 1.0) - aws-sdk-resources (2.11.93) - aws-sdk-core (= 2.11.93) + aws-sdk-resources (2.11.105) + aws-sdk-core (= 2.11.105) aws-sigv4 (1.0.3) berkshelf (4.3.5) addressable (~> 2.3, >= 2.3.4) @@ -78,13 +78,13 @@ GEM celluloid-io (0.16.2) celluloid (>= 0.16.0) nio4r (>= 1.1.0) - chef-config (13.10.0) + chef-config (13.10.4) addressable fuzzyurl mixlib-config (>= 2.2.12, < 3.0) mixlib-shellout (~> 2.0) tomlrb (~> 1.2) - chef-sugar (3.6.0) + chef-sugar (4.0.1) citrus (3.0.2) cleanroom (1.0.0) coderay (1.1.2) @@ -114,7 +114,7 @@ GEM kitchen-vagrant (1.3.2) test-kitchen (~> 1.4) libyajl2 (1.2.0) - license_scout (1.0.10) + license_scout (1.0.13) ffi-yajl (~> 2.2) mixlib-shellout (~> 2.2) toml-rb (~> 1.0) @@ -124,13 +124,13 @@ GEM multi_json (~> 1.10) method_source (0.9.0) minitar (0.6.1) - mixlib-archive (0.4.8) + mixlib-archive (0.4.13) mixlib-log mixlib-authentication (2.1.1) mixlib-cli (1.7.0) mixlib-config (2.2.13) tomlrb - mixlib-install (3.11.2) + mixlib-install (3.11.5) mixlib-shellout mixlib-versioning thor @@ -150,7 +150,7 @@ GEM net-ssh (>= 2.6.5) nio4r (2.3.1) nori (2.6.0) - octokit (4.9.0) + octokit (4.10.0) sawyer (~> 0.8.0, >= 0.5.3) ohai (13.10.0) chef-config (>= 12.5.0.alpha.1, < 14) @@ -171,7 +171,7 @@ GEM progressbar zhexdump (>= 0.0.2) plist (3.4.0) - progressbar (1.9.0) + progressbar (1.10.0) pry (0.11.3) coderay (~> 1.1.0) method_source (~> 0.9.0) @@ -201,7 +201,7 @@ GEM retryable (~> 2.0) semverse (~> 1.1) varia_model (~> 0.4.0) - ruby-progressbar (1.9.0) + ruby-progressbar (1.10.0) rubyntlm (0.6.2) rubyzip (1.2.1) sawyer (0.8.1) @@ -212,7 +212,7 @@ GEM molinillo (~> 0.4.2) semverse (~> 1.1) systemu (2.6.5) - test-kitchen (1.22.0) + test-kitchen (1.23.2) mixlib-install (~> 3.6) mixlib-shellout (>= 1.2, < 3.0) net-scp (~> 1.1) @@ -245,7 +245,7 @@ GEM winrm-elevated (1.1.0) winrm (~> 2.0) winrm-fs (~> 1.0) - winrm-fs (1.2.0) + winrm-fs (1.2.1) erubis (~> 2.7) logging (>= 1.6.1, < 3.0) rubyzip (~> 1.1) @@ -272,4 +272,4 @@ DEPENDENCIES winrm-fs (~> 1.0) BUNDLED WITH - 1.16.2 + 1.16.3 |