summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Bump openssl and properly set omnibus_overridesopenssl_bump2Tim Smith2017-11-093-20/+20
| | | | Signed-off-by: Tim Smith <tsmith@chef.io>
* Update CHANGELOG.md to reflect the promotion of 12.21.26 to stableChef Expeditor2017-10-301-16/+13
|
* Bump version to 12.21.26 by Expeditorv12.21.26Chef Expeditor2017-10-275-11/+12
|
* Merge pull request #6531 from chef/chef_12_depsThom May2017-10-272-31/+33
|\ | | | | Update liblzma, libxml2, libxslt, libyaml, zlib, and openssl
| * Update liblzma, libxml2, libxslt, libyaml, zlib, and opensslchef_12_depsTim Smith2017-10-252-31/+33
|/ | | | | | Bump all omnibus deps to pull in security and bug fixes Signed-off-by: Tim Smith <tsmith@chef.io>
* Bump version to 12.21.25 by Expeditorv12.21.25Chef Expeditor2017-10-235-11/+12
|
* Merge pull request #6517 from chef/force_buildLamont Granquist2017-10-231-1/+1
|\ | | | | Update ruby version required in readme
| * Update ruby version required in readmeTim Smith2017-10-231-1/+1
|/ | | | | | Really I just need to kick off a build, but this should also get fixed Signed-off-by: Tim Smith <tsmith@chef.io>
* Bump version to 12.21.24 by Expeditorv12.21.24Chef Expeditor2017-10-195-11/+12
|
* Merge pull request #6509 from chef/ohai_825Thom May2017-10-192-2/+2
|\ | | | | Pull in Ohai 8.25
| * Pull in Ohai 8.25ohai_825Tim Smith2017-10-182-2/+2
|/ | | | Signed-off-by: Tim Smith <tsmith@chef.io>
* Bump version to 12.21.23 by Expeditorv12.21.23Chef Expeditor2017-10-185-11/+12
|
* Merge pull request #6507 from chef/latest_rubygemsLamont Granquist2017-10-181-1/+1
|\ | | | | Use Rubygems 2.6.14 to fix CVE-2017-0903
| * Use Rubygems 2.6.14 to fix CVE-2017-0903latest_rubygemsTim Smith2017-10-181-1/+1
| | | | | | | | | | | | Whitelist classes and symbols that are in loaded YAML. See CVE-2017-0903 for full details. Signed-off-by: Tim Smith <tsmith@chef.io>
* | 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.1
| * | Pull in Ohai 8.24.1latest_ohaiTim Smith2017-10-181-1/+1
| |/ | | | | | | Signed-off-by: Tim Smith <tsmith@chef.io>
* | 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.3
| * | Don't use the safe navigation operator which requires Ruby 2.3Tim Smith2017-10-181-1/+1
| |/ | | | | | | | | | | This was backported from Chef 13 where we require Ruby 2.3. This won't work in Ruby 2.2. Signed-off-by: Tim Smith <tsmith@chef.io>
* | 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 configuration
| * MSYS-684: Added parser for DSC configurationbtm/chef-12-dscpiyushawasthi2017-10-165-38/+182
| | | | | | | | Signed-off-by: piyushawasthi <piyush.awasthi@msystechnologies.com>
* | 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 build
| * | bump a copyright date to kick off a buildLamont Granquist2017-10-161-1/+1
|/ / | | | | | | Signed-off-by: Lamont Granquist <lamont@scriptkiddie.org>
* | update copyright date in README to bump off a buildLamont Granquist2017-10-161-1/+1
|/ | | | Signed-off-by: Lamont Granquist <lamont@scriptkiddie.org>
* 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 script
| * Add environment/cwd to bundle freeze scriptScott Hain2017-10-161-1/+1
|/ | | | Signed-off-by: Scott Hain <shain@chef.io>
* 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 #6490
| * 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>