summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* node attributes: remove useless dup in merge_alllcg/backport-6356Lamont Granquist2017-08-281-4/+0
* Update Changelog for v12.21.4 buildBryan McLellan2017-08-151-1/+11
* Bump version to 12.21.4 by Chef Expeditorv12.21.4Chef Expeditor2017-08-145-9/+9
* Merge pull request #6333 from chef/tduffield/work-around-bugTom Duffield2017-08-141-3/+8
|\
| * Fix up update_version to work around bundler bugtduffield/work-around-bugTom Duffield2017-08-141-3/+8
|/
* Update Gemfile.lock without attempting to install GemsTom Duffield2017-08-142-3/+1
* Add Expeditor to chef-12 branchTom Duffield2017-08-133-0/+104
* Don't `gem uninstall bundler` in TravisBryan McLellan2017-08-131-2/+0
* Update SHA1 fingerprint for MSI signing certSeth Chisamore2017-08-131-2/+2
* Use Ruby 2.3.4 (latest 2.3) with GCC 7 PatchBryan McLellan2017-08-132-3/+3
* made changes to work file and remote_file resource work for lazyNAshwini2017-08-082-4/+177
* Merge pull request #6290 from chef/jsinha/BEN-180-chef-12Thom May2017-07-314-22/+22
|\
| * Update libiconv versionjsinha/BEN-180-chef-12Jaymala Sinha2017-07-312-2/+2
| * Revert bundler versionJaymala Sinha2017-07-281-2/+2
| * Update omnibus-softwareJaymala Sinha2017-07-281-7/+7
| * [BEN-180] Rename resource template in chef-12 and update omnibusJaymala Sinha2017-07-252-21/+21
|/
* release 12.21.3v12.21.312.21.3Bryan McLellan2017-06-235-9/+21
* Properly send run_list_expanded event in policy node caseTyler Cloke2017-06-232-1/+77
* Bump version of chef to 12.21.2v12.21.2Thom May2017-06-214-8/+8
* Merge pull request #6231 from chef/tm/chefstyle_0_5Thom May2017-06-214-12/+10
|\
| * lock chefstyle at 0.5tm/chefstyle_0_5Thom May2017-06-214-12/+10
* | release 12.21.1v12.21.1Thom May2017-06-205-8/+14
* | Looks like this is broken on SLES 12.0/x64 tooThom May2017-06-201-1/+1
|/
* 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
|\