summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* lock ffi at 1.9.21tm/lock_ffiThom May2018-03-072-4/+7
* Update CHANGELOG.md to reflect the promotion of 13.8.3Chef Expeditor2018-03-052-7/+11
* Bump version to 13.8.4 by Expeditorv13.8.4Chef Expeditor2018-03-055-11/+12
* Merge pull request #6936 from chef/site_failure_deprecated_chef_13Thom May2018-03-051-2/+7
|\
| * [knife] Don't crash when a deprecated cookbook has no replacement (#6853)site_failure_deprecated_chef_13rlyders2018-03-021-2/+7
|/
* Bump version to 13.8.3 by Expeditorv13.8.3Chef Expeditor2018-03-025-11/+12
* Merge pull request #6934 from chef/bump_13_depsTim Smith2018-03-024-49/+42
|\
| * Bump dependencies to pull in Ohai 13 / InSpec 1.51.21Tim Smith2018-03-023-44/+40
| * Pin InSpec to 1.X and Chefstyle to 0.6.0Tim Smith2018-03-021-5/+2
|/
* Update CHANGELOG.md to reflect the promotion of 13.8.0Chef Expeditor2018-02-272-17/+21
* Bump version to 13.8.2 by Expeditorv13.8.2Chef Expeditor2018-02-265-14/+15
* Merge pull request #6892 from chef/knife_configThom May2018-02-263-4/+15
|\
| * Link to the knife.rb docs when the knife.rb file is missingknife_configTim Smith2018-02-213-4/+15
* | Bump version to 13.8.1 by Expeditorv13.8.1Chef Expeditor2018-02-235-11/+12
* | Merge pull request #6912 from chef/lcg/revert-revert-derpLamont Granquist2018-02-231-6/+7
|\ \
| * | Revert "Revert "fixup some unit tests""lcg/revert-revert-derpLamont Granquist2018-02-231-6/+7
|/ /
* | update release notesThom May2018-02-231-1/+14
* | Bump version to 13.8.0 by Expeditorv13.8.0Chef Expeditor2018-02-233-7/+7
* | Merge pull request #6909 from chef/tm/fix_ohai_loadingThom May2018-02-232-1/+2
|\ \
| * | Ensure we pull in ohai on the 13 branchtm/fix_ohai_loadingThom May2018-02-232-1/+2
|/ /
* | meaningless edit to get a new releaseLamont Granquist2018-02-231-1/+1
* | Revert "Per-container deep merge caching"Lamont Granquist2018-02-231-2/+2
* | Bump version to 13.7.28 by Expeditorv13.7.28Chef Expeditor2018-02-235-14/+15
* | Merge pull request #6898 from chef/lcg/chef-13-revert-lazy-attributesLamont Granquist2018-02-229-372/+159
|\ \
| * | Revert "Per-container deep merge caching"Lamont Granquist2018-02-228-311/+152
| * | Revert "turbo attribute merging"Lamont Granquist2018-02-221-16/+1
| * | Revert "turboize arrays"Lamont Granquist2018-02-221-36/+10
| * | Revert "remove comments + debugging"Lamont Granquist2018-02-222-0/+3
| * | Revert "remove more debugging and revert no-longer necessary fix"Lamont Granquist2018-02-221-2/+4
| * | Revert "fixup some unit tests"Lamont Granquist2018-02-221-7/+6
| * | Revert "fix node assignment of ImmutableArrays to VividMashes/AttrArrays"Lamont Granquist2018-02-223-18/+1
|/ /
* | Merge pull request #6897 from chef/fix_chef_13_buildsLamont Granquist2018-02-222-13/+40
|\ \
| * | mock specs to very fake user+groupfix_chef_13_buildsLamont Granquist2018-02-221-11/+14
| * | Fix travis to correctly run-as-rootLamont Granquist2018-02-222-2/+26
* | | Bump version to 13.7.27 by Expeditorv13.7.27Chef Expeditor2018-02-225-11/+12
* | | Bump version to 13.7.26 by Expeditorv13.7.26Chef Expeditor2018-02-225-11/+12
|/ /
* | Merge pull request #6893 from chef/search_idsThom May2018-02-221-1/+3
|\ \
| * | Change single quotes to double quotes to appease the Style Godssearch_idsZane Geiger2018-02-211-1/+1
| * | Prevent knife search --id-only from outputting IDs in the same format as an e...Zane Geiger2018-02-211-1/+3
| |/
* | Merge pull request #6894 from chef/knife_ssh_exitThom May2018-02-222-8/+6
|\ \
| * | change to boolean in bootstrap as wellknife_ssh_exitSarkis Varozian2018-02-211-1/+1
| * | refactor on_error optionSarkis Varozian2018-02-211-8/+6
| * | use a stricter comparison here so knife ssh only fails ifSarkis Varozian2018-02-211-1/+1
| |/
* | Merge pull request #6891 from chef/sort_invitesThom May2018-02-221-1/+1
|\ \ | |/ |/|
| * invites_sort_fail: Clean the invites array before sorting itsort_invitesmarkgibbons2018-02-211-1/+1
|/
* Bump version to 13.7.25 by Expeditorv13.7.25Chef Expeditor2018-02-215-11/+12
* Merge pull request #6886 from chef/libxml2_chef13Thom May2018-02-211-1/+1
|\
| * Update libxml2 to 2.9.7libxml2_chef13Tim Smith2018-02-201-1/+1
|/
* Bump version to 13.7.24 by Expeditorv13.7.24Chef Expeditor2018-02-155-11/+12
* Merge pull request #6856 from chef/task_chef13Thom May2018-02-152-5/+13
|\