summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* backport of #6490lcg/dnf-platform-tweaks-backportLamont Granquist2017-10-112-9/+19
| | | | | | | we have to worry about amazon being in the rhel platform_family in Chef-12. Signed-off-by: Lamont Granquist <lamont@scriptkiddie.org>
* 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
| | | | | We should not stack-trace, we should exit with a clean error Signed-off-by: Phil Dibowitz <phil@ipom.com>
* 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
|\ | | | | Backport #6435 to Chef-12: dnf_resource
| * fix testsNaomi Reeves2017-09-281-1/+4
| | | | | | | | Signed-off-by: Naomi Reeves <naomi.c.reeves@gmail.com>
| * Backport #6435 to Chef-12: dnf_resourceNaomi Reeves2017-09-281-1/+3
| | | | | | | | | | | | Backport #6435 to Chef 12 Signed-off-by: Naomi Reeves <naomi.c.reeves@gmail.com>
* | Merge pull request #6458 from chef/tduffield/expeditor/12-glob-matchingTom Duffield2017-09-291-2/+2
|\ \ | |/ |/| [Expeditor] Use new glob-style version matching
| * [Expeditor] Use new glob-style version matchingtduffield/expeditor/12-glob-matchingTom Duffield2017-09-281-2/+2
| | | | | | | | Signed-off-by: Tom Duffield <tom@chef.io>
* | Merge pull request #6459 from chef/testsTim Smith2017-09-284-75/+63
|\ \ | | | | | | Get the build green again
| * | Remove testing of audit, halite, and chef-zero and test on latest rubiesTim Smith2017-09-283-37/+22
| | | | | | | | | | | | | | | | | | Remove the failing tests so we start actually looking at the others. Signed-off-by: Tim Smith <tsmith@chef.io>
| * | Update cookbooks for kitchen testsTim Smith2017-09-281-38/+41
|/ / | | | | | | | | | | This should resolve our centos 7 failure the same way it did on master Signed-off-by: Tim Smith <tsmith@chef.io>
* | Bring in the integration test updates that we done to Chef 13Tim Smith2017-09-2831-345/+82
|/ | | | Signed-off-by: Tim Smith <tsmith@chef.io>
* 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 changelog
| * Add tags so Expeditor can manage chef-12 changelogtduffield/chef-12/enable-changelog-managementTom Duffield2017-09-271-3/+9
|/ | | | Signed-off-by: Tom Duffield <tom@chef.io>
* Merge pull request #6452 from chef/tduffield/configure-docker-imageTim Smith2017-09-271-0/+3
|\ | | | | Fully configure Docker image in Expeditor
| * Fully configure Docker image in ExpeditorTom Duffield2017-09-271-0/+3
|/ | | | Signed-off-by: Tom Duffield <tom@chef.io>
* 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
|\ | | | | Rebuild to use the latest patched Ruby
| * Bump for PRchef12timeTim Smith2017-09-270-0/+0
|/ | | | Signed-off-by: Tim Smith <tsmith@chef.io>
* Empty commit to force build with Ruby 2.4.2Tim Smith2017-09-270-0/+0
| | | | Signed-off-by: Tim Smith <tsmith@chef.io>
* 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
|\ | | | | Backport 6094 to Chef 12: apt-key finger no longer matches extract fingerprints regex
| * apt-key finger no longer matches extract fingerprints regexMatt Whiteley2017-09-211-4/+7
|/ | | | Signed-off-by: Matt Whiteley <mattwhiteley@gmail.com>
* 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 CVEs
| * Update Chef 12 release notes with CVEstm/relnotes_12Thom May2017-09-141-1/+15
| | | | | | | | Signed-off-by: Thom May <thom@chef.io>
* | 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 CVEs
| * update ruby version for multiple CVEstm/2_3_5Thom May2017-09-142-26/+29
|/ | | | Signed-off-by: Thom May <thom@chef.io>
* Merge pull request #6399 from chef/btm/12Bryan McLellan2017-09-131-1/+1
|\ | | | | Typo fix to trigger a build
| * Typo fix to trigger a buildBryan McLellan2017-09-131-1/+1
|/ | | | Signed-off-by: Bryan McLellan <btm@loftninjas.org>
* Update changelog for last and next releaseBryan McLellan2017-09-131-2/+14
| | | | | | Hopefully this triggers a build as 12.21.11 and it succeeds. Signed-off-by: Bryan McLellan <btm@loftninjas.org>
* Merge pull request #6397 from chef/tduffield/expeditor/update-configTom Duffield2017-09-121-36/+14
|\ | | | | Update Expeditor config to meet new standards
| * Update Expeditor config to meet new standardstduffield/expeditor/update-configTom Duffield2017-09-121-36/+14
|/ | | | Signed-off-by: Tom Duffield <tom@chef.io>
* Merge pull request #6395 from chef/btm/12_dsc-scriptBryan McLellan2017-09-122-15/+77
|\ | | | | backport #6383 to 12
| * Code refactor and add spec for powershell version 5piyushawasthi2017-09-122-9/+60
| | | | | | | | Signed-off-by: piyushawasthi <piyush.awasthi@msystechnologies.com>
| * Refactor all command line options into lcm_command()Bryan McLellan2017-09-121-12/+13
| | | | | | | | Signed-off-by: Bryan McLellan <btm@loftninjas.org>
| * MSYS-656 - fixed dsc_script for WMF5piyushawasthi2017-09-121-5/+15
|/ | | | Signed-off-by: piyushawasthi <piyush.awasthi@msystechnologies.com>
* Bump version to 12.21.10 by Chef Expeditorv12.21.10Chef Expeditor2017-09-054-8/+8
|
* Merge pull request #6367 from chef/lcg/backport-6362Lamont Granquist2017-09-053-25/+100
|\ | | | | backport of 6362
| * immutablize on the fly and reduce dupinglcg/backport-6362Lamont Granquist2017-09-013-25/+100
| | | | | | | | Signed-off-by: Lamont Granquist <lamont@scriptkiddie.org>
* | Bump version to 12.21.9 by Chef Expeditorv12.21.9Chef Expeditor2017-09-044-8/+8
| |
* | Merge pull request #6377 from jaymzh/dnf-12Thom May2017-09-041-1/+3
|\ \ | |/ |/| Backport #6351 to Chef-12
| * Backport #6351 to Chef-12Phil Dibowitz2017-09-011-1/+3
| | | | | | | | Signed-off-by: Phil Dibowitz <phil@ipom.com>
* | Bump version to 12.21.8 by Chef Expeditorv12.21.8Chef Expeditor2017-09-014-8/+8
| |
* | Merge pull request #6376 from chef/lcg/chef-12-readline-depLamont Granquist2017-09-011-1/+1
|\ \ | |/ |/| bump rb-readline
| * bump rb-readlinelcg/chef-12-readline-depLamont Granquist2017-09-011-1/+1
|/ | | | Signed-off-by: Lamont Granquist <lamont@scriptkiddie.org>
* Bump version to 12.21.7 by Chef Expeditorv12.21.7Chef Expeditor2017-08-294-8/+8
|
* Merge pull request #6366 from chef/lcg/bump-rubygems-chef-12Lamont Granquist2017-08-291-1/+1
|\ | | | | backport to chef-12: bump rubygems to 2.6.13