Merge pull request #228 from chef/chef_apply_rename

[SHACK-250] Pull in new chef-apply gem
chef · Jul 10, 2018 · 51cdbc4 · 51cdbc4
2 parents 3030948 + ea00921
commit 51cdbc4
Show file tree

Hide file tree

Showing 83 changed files with 8 additions and 8,973 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
diff --git a/.expeditor/config.yml b/.expeditor/config.yml
@@ -25,8 +25,6 @@ merge_actions:
         - "Version: Skip Bump"
         - "Expeditor: Skip Version Bump"
         - "Expeditor: Skip All"
-  - bash:.expeditor/update_version.sh:
-      only_if: built_in:bump_version
   - built_in:update_changelog:
       ignore_labels:
         - "Meta: Exclude From Changelog"

diff --git a/.expeditor/update_version.sh b/.expeditor/update_version.sh
diff --git a/components/chef-run/.gitignore b/components/chef-run/.gitignore
diff --git a/components/chef-run/Gemfile b/components/chef-run/Gemfile