summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Remove 'angrychef' from chef-12 build concernstduffield/remove-angrychef-12Tom Duffield2018-04-101-1/+0
* Update CHANGELOG.md to reflect the promotion of 12.22.3Chef Expeditor2018-04-091-12/+9
* Bump version to 12.22.3 by Expeditorv12.22.3Chef Expeditor2018-03-205-11/+12
* Merge pull request #7011 from chef/btm/12-fix-lsa-heap-corruptionLamont Granquist2018-03-192-1/+36
|\
| * Fix regression in #6980, add functional testsBryan McLellan2018-03-192-1/+36
|/
* Bump version to 12.22.2 by Expeditorv12.22.2Chef Expeditor2018-03-165-10/+18
* Merge pull request #6992 from chef/btm/12-fix-lsa-heap-corruptionBryan McLellan2018-03-161-16/+14
|\
| * Pass pointer to LsaFreeMemory, not FFI::MemoryPointerbtm/12-fix-lsa-heap-corruptionBryan McLellan2018-03-151-16/+14
|/
* Update CHANGELOG.md to reflect the promotion of 12.22.1Chef Expeditor2018-03-011-19/+15
* Bump version to 12.22.1 by Expeditorv12.22.1Chef Expeditor2018-03-015-10/+12
* Merge pull request #6918 from chef/one_moreThom May2018-03-014-59/+86
|\
| * Port the travis fix from #6888one_moreTim Smith2018-02-282-13/+40
| * More last Chef 12 dependency bumpTim Smith2018-02-282-46/+46
|/
* Bump version to 12.22.0 by Expeditorv12.22.0Chef Expeditor2018-02-214-10/+11
* Merge pull request #6881 from chef/xmlThom May2018-02-214-3/+29
|\
| * Bump version to 12.22xmlTim Smith2018-02-202-1/+27
| * Update to libxml2 2.9.7Tim Smith2018-02-202-2/+2
|/
* Bump version to 12.21.37 by Expeditorv12.21.37Chef Expeditor2018-02-095-11/+12
* Merge pull request #6840 from chef/tduffield/license_scout/pin-1.xThom May2018-02-092-26/+19
|\
| * Use the version of LicenseScout that comes with the Omnibus gem.tduffield/license_scout/pin-1.xTom Duffield2018-02-082-26/+19
|/
* Bump version to 12.21.36 by Expeditorv12.21.36Chef Expeditor2018-01-315-11/+12
* Merge pull request #6819 from chef/tm/fix_stupid_unixes_harderThom May2018-01-312-7/+9
|\
| * missed oneLamont Granquist2018-01-311-1/+1
| * use TMPDIR correctly in initscriptLamont Granquist2018-01-311-4/+6
| * fix bff tests for tmpdirLamont Granquist2018-01-311-3/+3
|/
* Bump version to 12.21.35 by Expeditorv12.21.35Chef Expeditor2018-01-315-11/+12
* Merge pull request #6817 from chef/tm/fix_stupid_unixesThom May2018-01-311-1/+1
|\
| * backport #6746tm/fix_stupid_unixesThom May2018-01-311-1/+1
|/
* Bump version to 12.21.34 by Expeditorv12.21.34Chef Expeditor2018-01-315-11/+12
* Merge pull request #6814 from chef/chef_12_shipitTim Smith2018-01-311-52/+27
|\
| * Format omnibus markdownchef_12_shipitTim Smith2018-01-301-52/+27
|/
* Bump version to 12.21.33 by Expeditorv12.21.33Chef Expeditor2018-01-305-11/+12
* Merge pull request #6811 from chef/fix_docker_buildsTim Smith2018-01-303-54/+87
|\
| * Split out Travis tests the same way we did for Chef 13fix_docker_buildsTim Smith2018-01-301-31/+80
| * the format of this flametest doesn't matterLamont Granquist2018-01-301-21/+5
| * Fix Dockerfile to build off EL6 not EL5Tim Smith2018-01-301-2/+2
|/
* Bump version to 12.21.32 by Expeditorv12.21.32Chef Expeditor2018-01-305-10/+18
* Merge pull request #6783 from chef/updatesThom May2018-01-304-53/+51
|\
| * Update Ohai, omnibus, and Ruby versionsTim Smith2018-01-294-53/+51
|/
* Update CHANGELOG.md to reflect the promotion of 12.21.31 to stableChef Expeditor2017-12-191-15/+12
* Bump version to 12.21.31 by Expeditorv12.21.31Chef Expeditor2017-12-195-11/+12
* Merge pull request #6681 from chef/shain/backport_git_docker_testsLamont Granquist2017-12-195-26/+5
|\
| * Backport 6673 to chef-12 branchshain/backport_git_docker_testsScott Hain2017-12-155-26/+5
|/
* Bump version to 12.21.30 by Expeditorv12.21.30Chef Expeditor2017-12-145-11/+12
* Merge pull request #6666 from chef/openssl_and_othersTim Smith2017-12-134-33/+33
|\
| * Update the lockfiles to pull in the new omnibusopenssl_and_othersTim Smith2017-12-132-26/+26
| * Update openssl to 1.0.2.nTim Smith2017-12-132-7/+7
|/
* Bump version to 12.21.29 by Expeditorv12.21.29Chef Expeditor2017-12-125-11/+12
* Merge pull request #6659 from chef/shain/backport_test_fixesScott Hain2017-12-129-139/+215
|\
| * Disable specific tests due to gem version issuesshain/backport_test_fixesScott Hain2017-12-121-8/+0