summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Release 12.21.0tm/12_21Thom May2017-06-2010-113/+171
| | | | Signed-off-by: Thom May <thom@chef.io>
* Merge pull request #6224 from chef/tm/backport_acceptance_timeoutThom May2017-06-191-0/+1
|\ | | | | bump acceptance provisioning timeout to 10 minutes
| * bump acceptance provisioning timeout to 10 minutestm/backport_acceptance_timeoutThom May2017-06-191-0/+1
|/ | | | Signed-off-by: Thom May <thom@chef.io>
* Merge pull request #6219 from chef/tm/bump_zlib_12Thom May2017-06-192-18/+18
|\ | | | | bump zlib to 1.2.11
| * bump zlib to 1.2.11tm/bump_zlib_12Thom May2017-06-162-18/+18
| | | | | | | | Signed-off-by: Thom May <thom@chef.io>
* | Merge pull request #6222 from coderanger/supports-exceptionNoah Kantrowitz2017-06-161-0/+4
|\ \ | | | | | | Special case for the supports pseudo-property for Chef 12.
| * | Special case for the supports pseudo-property for Chef 12.Noah Kantrowitz2017-06-161-0/+4
| |/ | | | | | | Signed-off-by: Noah Kantrowitz <noah@coderanger.net>
* | Trying to update the Travis branch config so 12.x backport PRs will get tested.Noah Kantrowitz2017-06-161-1/+1
|/ | | | Signed-off-by: Noah Kantrowitz <noah@coderanger.net>
* Merge pull request #6173 from coderanger/error-for-12Noah Kantrowitz2017-05-302-8/+70
|\ | | | | Backport error info for Chef 12
| * Chefstyle fixes.Noah Kantrowitz2017-05-242-7/+6
| | | | | | | | Signed-off-by: Noah Kantrowitz <noah@coderanger.net>
| * Expand the system info displayed on error to give us some more data to work ↵Noah Kantrowitz2017-05-242-8/+71
|/ | | | | | with when helping users. Signed-off-by: Noah Kantrowitz <noah@coderanger.net>
* Merge pull request #6157 from ↵Thom May2017-05-162-11/+11
|\ | | | | | | | | shortdudey123/prefer_systemd_with_sysvinit_backport Prefer Systemd with sysvinit script over Upstart for service provider
| * Prefer Systemd with sysvinit script over Upstart for service providerGrant Ridder2017-05-152-11/+11
|/ | | | | | On newer Debian based systems that use systemd to have a package install a SysV init and Upstart script. Systemd can use systemd service files or SysV init scripts. However, on the Chef serivce provider side, this is not reflected. So in this case, Upstart will be prefered even if Upstart itself is not installed on the system. Signed-off-by: Grant Ridder <shortdudey123@gmail.com>
* Merge pull request #6129 from akitada/nil-segmentsThom May2017-05-112-1/+13
|\ | | | | Discard caches for files not in the manifest
| * Discard caches for files not in the manifestAkira Kitada2017-05-102-1/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | cookbook_segment returns nil if the cache is not found in the manifest. This can happen when chef client 12 runs on a node where chef client 13 generated cookbook cache files. Currently, chef client fails in this case. This patch fixes it. It should be safe to remove those cache files because they are not cached in Chef 12, after all. Signed-off-by: Akira Kitada <akitada@gmail.com>
* | Merge pull request #6141 from chef/lcg/fix-appveyor-on-chef-12Lamont Granquist2017-05-101-4/+11
|\ \ | |/ |/| fix appveyor on chef-12
| * probably still need all this stupid garbageLamont Granquist2017-05-101-1/+3
| | | | | | | | | | | | i can see that chef-12 is going to fill me with intense rage soon. Signed-off-by: Lamont Granquist <lamont@scriptkiddie.org>
| * fix appveyor on chef-12Lamont Granquist2017-05-101-7/+12
|/ | | | Signed-off-by: Lamont Granquist <lamont@scriptkiddie.org>
* Merge pull request #6110 from chef/sd/version-12.20.3v12.20.3Stephen Delano2017-04-304-8/+8
|\ | | | | Version bump for 12.20.3
| * bump to version 12.20.3sd/version-12.20.3sdelano2017-04-304-8/+8
|/ | | | Signed-off-by: Stephen Delano <stephen@chef.io>
* Merge pull request #6108 from chef/sd/fix-solaris-testsStephen Delano2017-04-281-3/+3
|\ | | | | Merge pull request #5964 from chef/lcg/solaris-ruby24-fix
| * Merge pull request #5964 from chef/lcg/solaris-ruby24-fixsd/fix-solaris-testsLamont Granquist2017-04-281-3/+3
|/ | | | | | fix ruby-2.4 func link tests on solaris 11 Signed-off-by: Stephen Delano <stephen@chef.io>
* Merge pull request #6106 from chef/rhass/chef-12/fix-gemfile-lockRyan Hass2017-04-281-20/+22
|\ | | | | Update omnibus/Gemfile.lock for Chef 12.
| * Update omnibus/Gemfile.lock for Chef 12.Ryan Hass2017-04-281-20/+22
|/ | | | | | This updates the Gemfile.lock so that Chef 12 can build successfully. Signed-off-by: Ryan Hass <rhass@users.noreply.github.com>
* Merge pull request #6040 from chef/required-recipe-backportThom May2017-04-113-0/+101
|\ | | | | Backport #6032 (required recipe) to Chef 12
| * Clarify log messaging for required recipe featurerequired-recipe-backportdanielsdeleo2017-04-102-2/+3
| | | | | | | | | | | | | | The previous log message didn't have enough context and could sound "scary" to users unfamiliar with the feature. Signed-off-by: Daniel DeLeo <dan@chef.io>
| * Merge pull request #6032 from chef/sd/required-recipeThom May2017-04-103-0/+100
|/ | | | | | server enforced required recipe Signed-off-by: Daniel DeLeo <dan@chef.io>
* Merge pull request #6039 from chef/tm/backport_5838Thom May2017-04-102-4/+12
|\ | | | | Ensure the apt package fix gets on chef-12 branch
| * Add a spec for apt_package install with quoted optionstm/backport_5838Mark Harrison2017-04-101-0/+10
| | | | | | | | Signed-off-by: Mark Harrison <mark@mivok.net>
| * Use shellsplit for apt_package optionsMark Harrison2017-04-101-4/+2
|/ | | | | | | | This correctly deals with quotes and so on in package options. Fixes #5836 Signed-off-by: Mark Harrison <mark@mivok.net>
* Use omnibus-toolchain on Windows platforms.Ryan Hass2017-03-082-27/+24
| | | | | | | | This updates the branch pinnings to use the omnibus-toolchain enabled version of omnibus and omnibus-software. Signed-off-by: Ryan Hass <rhass@users.noreply.github.com> Signed-off-by: Tom Duffield <tom@chef.io>
* Fix apt_repository for latest os version 16.10Salim Afiune2017-03-082-30/+38
| | | | | | | | | | | | | | | | Great description and solution of the problem made by @jeremiahsnapp in the below issue! Closes https://github.com/chef/chef/issues/5831 I have validated this works fine for the following os: * Ubuntu 14.04 * Ubuntu 16.04 * Ubuntu 16.10 (latest) * Debian-6.0.10 * Debian-8.7 (latest) Signed-off-by: Salim Afiune <afiune@chef.io>
* Bump version to 12.20.2 (manually)Tom Duffield2017-03-076-13/+43
| | | | Signed-off-by: Tom Duffield <tom@chef.io>
* Verify data bag exists before trying to create itSalim Afiune2017-03-071-4/+6
| | | | | | | | | | | | | | | | | [ZD-12613] There are users who want to customize permissions to prevent a group of users from creating new data bags but want to allow the group of users to create data bag items within an existing data bag. If the user doesn't have permission to create data bags then the current API request sequence will prevent the user from creating a data bag item even if the data bag already exists. This commit fixes the above problem by verifying (not trying to create) if the data bag exist through a GET request, if it doesn't the it tries to generate it, then it proceeds to create the data bag item. Signed-off-by: Salim Afiune <afiune@chef.io>
* Add test to assert we use GET RequestSalim Afiune2017-03-071-45/+65
| | | | Signed-off-by: Salim Afiune <afiune@chef.io>
* Bump version of chef to 12.19.35 by Chef Versioner.v12.19.35Chef Versioner2017-02-226-34/+13
|
* Merge pull request #5826 from chef/shain/deprecate_ciscoLamont Granquist2017-02-221-0/+4
|\ | | | | Deprecate Cisco platforms
| * Deprecate Cisco platformsshain/deprecate_ciscoScott Hain2017-02-171-0/+4
|/ | | | Signed-off-by: Scott Hain <shain@chef.io>
* Bump version of chef to 12.19.34 by Chef Versioner.v12.19.34Chef Versioner2017-02-175-11/+11
|
* Merge pull request #5825 from chef/lcg/changelogLamont Granquist2017-02-171-26/+22
|\ | | | | changelog update for 12.19.33
| * missed classifying one PR in the CHANGELOGLamont Granquist2017-02-171-2/+2
| | | | | | | | Signed-off-by: Lamont Granquist <lamont@scriptkiddie.org>
| * changelog update for 12.19.33Lamont Granquist2017-02-171-24/+20
|/ | | | Signed-off-by: Lamont Granquist <lamont@scriptkiddie.org>
* Bump version of chef to 12.19.33 by Chef Versioner.v12.19.33Chef Versioner2017-02-165-10/+10
|
* Merge pull request #5821 from chef/lcg/revert-dep-bumpLamont Granquist2017-02-162-23/+22
|\ | | | | Revert "updating dependencies"
| * Revert "updating dependencies"Lamont Granquist2017-02-162-23/+22
|/ | | | | | This reverts commit bd45e8360cf233cbadba17c4ee9870d450a610f8. Signed-off-by: Lamont Granquist <lamont@scriptkiddie.org>
* Bump version of chef to 12.19.32 by Chef Versioner.v12.19.32Chef Versioner2017-02-165-10/+10
|
* Merge pull request #5818 from chef/lcg/remove-ivarsLamont Granquist2017-02-1631-640/+640
|\ | | | | cleans up the remaining new/current_resource ivars in remaining provider code
| * cleans up the remaining new/current_resource ivarslcg/remove-ivarsLamont Granquist2017-02-1531-640/+640
| | | | | | | | | | | | switches from using ivars to accessors for getters Signed-off-by: Lamont Granquist <lamont@scriptkiddie.org>
* | Bump version of chef to 12.19.31 by Chef Versioner.v12.19.31Chef Versioner2017-02-155-11/+10
| |
* | Merge pull request #5817 from chef/lcg/bump-deps3Lamont Granquist2017-02-152-22/+23
|\ \ | |/ |/| updating dependencies
View Lorry Controller Status