summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Bump version to 12.21.22 by Expeditorv12.21.22Chef Expeditor2017-10-185-11/+12
* Merge pull request #6506 from chef/latest_ohaiLamont Granquist2017-10-181-1/+1
|\
| * Pull in Ohai 8.24.1latest_ohaiTim Smith2017-10-181-1/+1
* | Bump version to 12.21.21 by Expeditorv12.21.21Chef Expeditor2017-10-185-10/+18
* | Merge pull request #6508 from chef/unbreak_12Tim Smith2017-10-181-1/+1
|\ \
| * | Don't use the safe navigation operator which requires Ruby 2.3Tim Smith2017-10-181-1/+1
| |/
* | Update CHANGELOG.md to reflect the promotion of 12.21.20 to stableChef Expeditor2017-10-181-15/+13
|/
* Bump version to 12.21.20 by Chef Expeditorv12.21.20Chef Expeditor2017-10-175-11/+12
* Merge pull request #6500 from chef/btm/chef-12-dscThom May2017-10-175-38/+182
|\
| * MSYS-684: Added parser for DSC configurationbtm/chef-12-dscpiyushawasthi2017-10-165-38/+182
* | Bump version to 12.21.19 by Chef Expeditorv12.21.19Chef Expeditor2017-10-175-11/+12
* | Merge pull request #6501 from chef/lcg/bump-for-releaseLamont Granquist2017-10-161-1/+1
|\ \
| * | bump a copyright date to kick off a buildLamont Granquist2017-10-161-1/+1
|/ /
* | update copyright date in README to bump off a buildLamont Granquist2017-10-161-1/+1
|/
* Bump version to 12.21.18 by Chef Expeditorv12.21.18Chef Expeditor2017-10-165-11/+12
* Merge pull request #6499 from chef/shain/chef-12-gemfixLamont Granquist2017-10-161-1/+1
|\
| * Add environment/cwd to bundle freeze scriptScott Hain2017-10-161-1/+1
|/
* Bump version to 12.21.17 by Chef Expeditorv12.21.17Chef Expeditor2017-10-125-11/+12
* Merge pull request #6492 from chef/lcg/dnf-platform-tweaks-backportLamont Granquist2017-10-122-9/+19
|\
| * backport of #6490lcg/dnf-platform-tweaks-backportLamont Granquist2017-10-112-9/+19
|/
* Bump version to 12.21.16 by Chef Expeditorv12.21.16Chef Expeditor2017-10-105-11/+12
* Support new CriticalOhaiPlugins (backport #6486 to chef-12) (#6487)Phil Dibowitz2017-10-092-0/+14
* Bump version to 12.21.15 by Chef Expeditorv12.21.15Chef Expeditor2017-10-045-11/+19
* Merge pull request #6436 from NaomiReeves/backport_dnf_resourceThom May2017-10-032-2/+7
|\
| * fix testsNaomi Reeves2017-09-281-1/+4
| * Backport #6435 to Chef-12: dnf_resourceNaomi Reeves2017-09-281-1/+3
* | Merge pull request #6458 from chef/tduffield/expeditor/12-glob-matchingTom Duffield2017-09-291-2/+2
|\ \ | |/ |/|
| * [Expeditor] Use new glob-style version matchingtduffield/expeditor/12-glob-matchingTom Duffield2017-09-281-2/+2
* | Merge pull request #6459 from chef/testsTim Smith2017-09-284-75/+63
|\ \
| * | Remove testing of audit, halite, and chef-zero and test on latest rubiesTim Smith2017-09-283-37/+22
| * | Update cookbooks for kitchen testsTim Smith2017-09-281-38/+41
|/ /
* | Bring in the integration test updates that we done to Chef 13Tim Smith2017-09-2831-345/+82
|/
* Merge pull request #6453 from chef/tduffield/chef-12/enable-changelog-managementTim Smith2017-09-271-3/+9
|\
| * Add tags so Expeditor can manage chef-12 changelogtduffield/chef-12/enable-changelog-managementTom Duffield2017-09-271-3/+9
|/
* Merge pull request #6452 from chef/tduffield/configure-docker-imageTim Smith2017-09-271-0/+3
|\
| * Fully configure Docker image in ExpeditorTom Duffield2017-09-271-0/+3
|/
* Bump version to 12.21.14 by Chef Expeditorv12.21.14Chef Expeditor2017-09-274-8/+8
* Merge pull request #6451 from chef/chef12timeTim Smith2017-09-270-0/+0
|\
| * Bump for PRchef12timeTim Smith2017-09-270-0/+0
|/
* Empty commit to force build with Ruby 2.4.2Tim Smith2017-09-270-0/+0
* Bump version to 12.21.13 by Chef Expeditorv12.21.13Chef Expeditor2017-09-224-8/+8
* Merge pull request #6430 from chef/backport-6094Dan DeLeo2017-09-211-4/+7
|\
| * apt-key finger no longer matches extract fingerprints regexMatt Whiteley2017-09-211-4/+7
|/
* Bump version to 12.21.12 by Chef Expeditorv12.21.12Chef Expeditor2017-09-144-8/+8
* Merge pull request #6407 from chef/tm/relnotes_12Thom May2017-09-141-1/+15
|\
| * Update Chef 12 release notes with CVEstm/relnotes_12Thom May2017-09-141-1/+15
* | Bump version to 12.21.11 by Chef Expeditorv12.21.11Chef Expeditor2017-09-145-9/+9
|/
* Merge pull request #6405 from chef/tm/2_3_5Thom May2017-09-142-26/+29
|\
| * update ruby version for multiple CVEstm/2_3_5Thom May2017-09-142-26/+29
|/
* Merge pull request #6399 from chef/btm/12Bryan McLellan2017-09-131-1/+1
|\