summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* lock chefstyle at 0.5tm/chefstyle_0_5Thom May2017-06-214-12/+10
* Merge pull request #6226 from chef/tm/12_21v12.21.0Thom May2017-06-2010-113/+171
|\
| * Release 12.21.0tm/12_21Thom May2017-06-2010-113/+171
* | Merge pull request #6227 from chef/tm/backport_2016_fixesThom May2017-06-204-17/+46
|\ \ | |/ |/|
| * Fixed the specs and review commentstm/backport_2016_fixesNimishaS2017-06-204-21/+27
| * Fixing build failures of Windows Server 2016nimisha2017-06-204-4/+27
|/
* Merge pull request #6224 from chef/tm/backport_acceptance_timeoutThom May2017-06-191-0/+1
|\
| * bump acceptance provisioning timeout to 10 minutestm/backport_acceptance_timeoutThom May2017-06-191-0/+1
|/
* Merge pull request #6219 from chef/tm/bump_zlib_12Thom May2017-06-192-18/+18
|\
| * bump zlib to 1.2.11tm/bump_zlib_12Thom May2017-06-162-18/+18
* | Merge pull request #6222 from coderanger/supports-exceptionNoah Kantrowitz2017-06-161-0/+4
|\ \
| * | Special case for the supports pseudo-property for Chef 12.Noah Kantrowitz2017-06-161-0/+4
| |/
* | Trying to update the Travis branch config so 12.x backport PRs will get tested.Noah Kantrowitz2017-06-161-1/+1
|/
* Merge pull request #6173 from coderanger/error-for-12Noah Kantrowitz2017-05-302-8/+70
|\
| * Chefstyle fixes.Noah Kantrowitz2017-05-242-7/+6
| * Expand the system info displayed on error to give us some more data to work w...Noah Kantrowitz2017-05-242-8/+71
|/
* Merge pull request #6157 from shortdudey123/prefer_systemd_with_sysvinit_back...Thom May2017-05-162-11/+11
|\
| * Prefer Systemd with sysvinit script over Upstart for service providerGrant Ridder2017-05-152-11/+11
|/
* Merge pull request #6129 from akitada/nil-segmentsThom May2017-05-112-1/+13
|\
| * Discard caches for files not in the manifestAkira Kitada2017-05-102-1/+13
* | Merge pull request #6141 from chef/lcg/fix-appveyor-on-chef-12Lamont Granquist2017-05-101-4/+11
|\ \ | |/ |/|
| * probably still need all this stupid garbageLamont Granquist2017-05-101-1/+3
| * fix appveyor on chef-12Lamont Granquist2017-05-101-7/+12
|/
* Merge pull request #6110 from chef/sd/version-12.20.3v12.20.3Stephen Delano2017-04-304-8/+8
|\
| * bump to version 12.20.3sd/version-12.20.3sdelano2017-04-304-8/+8
|/
* Merge pull request #6108 from chef/sd/fix-solaris-testsStephen Delano2017-04-281-3/+3
|\
| * Merge pull request #5964 from chef/lcg/solaris-ruby24-fixsd/fix-solaris-testsLamont Granquist2017-04-281-3/+3
|/
* Merge pull request #6106 from chef/rhass/chef-12/fix-gemfile-lockRyan Hass2017-04-281-20/+22
|\
| * Update omnibus/Gemfile.lock for Chef 12.Ryan Hass2017-04-281-20/+22
|/
* Merge pull request #6040 from chef/required-recipe-backportThom May2017-04-113-0/+101
|\
| * Clarify log messaging for required recipe featurerequired-recipe-backportdanielsdeleo2017-04-102-2/+3
| * Merge pull request #6032 from chef/sd/required-recipeThom May2017-04-103-0/+100
|/
* Merge pull request #6039 from chef/tm/backport_5838Thom May2017-04-102-4/+12
|\
| * Add a spec for apt_package install with quoted optionstm/backport_5838Mark Harrison2017-04-101-0/+10
| * Use shellsplit for apt_package optionsMark Harrison2017-04-101-4/+2
|/
* Use omnibus-toolchain on Windows platforms.Ryan Hass2017-03-082-27/+24
* Fix apt_repository for latest os version 16.10Salim Afiune2017-03-082-30/+38
* Bump version to 12.20.2 (manually)Tom Duffield2017-03-076-13/+43
* Verify data bag exists before trying to create itSalim Afiune2017-03-071-4/+6
* Add test to assert we use GET RequestSalim Afiune2017-03-071-45/+65
* 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 platformsshain/deprecate_ciscoScott Hain2017-02-171-0/+4
|/
* 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
|\
| * missed classifying one PR in the CHANGELOGLamont Granquist2017-02-171-2/+2
| * changelog update for 12.19.33Lamont Granquist2017-02-171-24/+20
|/
* 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"Lamont Granquist2017-02-162-23/+22
|/