Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Bump openssl and properly set omnibus_overridesopenssl_bump2 | Tim Smith | 2017-11-09 | 3 | -20/+20 |
| | | | | Signed-off-by: Tim Smith <tsmith@chef.io> | ||||
* | Update CHANGELOG.md to reflect the promotion of 12.21.26 to stable | Chef Expeditor | 2017-10-30 | 1 | -16/+13 |
| | |||||
* | Bump version to 12.21.26 by Expeditorv12.21.26 | Chef Expeditor | 2017-10-27 | 5 | -11/+12 |
| | |||||
* | Merge pull request #6531 from chef/chef_12_deps | Thom May | 2017-10-27 | 2 | -31/+33 |
|\ | | | | | Update liblzma, libxml2, libxslt, libyaml, zlib, and openssl | ||||
| * | Update liblzma, libxml2, libxslt, libyaml, zlib, and opensslchef_12_deps | Tim Smith | 2017-10-25 | 2 | -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.25 | Chef Expeditor | 2017-10-23 | 5 | -11/+12 |
| | |||||
* | Merge pull request #6517 from chef/force_build | Lamont Granquist | 2017-10-23 | 1 | -1/+1 |
|\ | | | | | Update ruby version required in readme | ||||
| * | Update ruby version required in readme | Tim Smith | 2017-10-23 | 1 | -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.24 | Chef Expeditor | 2017-10-19 | 5 | -11/+12 |
| | |||||
* | Merge pull request #6509 from chef/ohai_825 | Thom May | 2017-10-19 | 2 | -2/+2 |
|\ | | | | | Pull in Ohai 8.25 | ||||
| * | Pull in Ohai 8.25ohai_825 | Tim Smith | 2017-10-18 | 2 | -2/+2 |
|/ | | | | Signed-off-by: Tim Smith <tsmith@chef.io> | ||||
* | Bump version to 12.21.23 by Expeditorv12.21.23 | Chef Expeditor | 2017-10-18 | 5 | -11/+12 |
| | |||||
* | Merge pull request #6507 from chef/latest_rubygems | Lamont Granquist | 2017-10-18 | 1 | -1/+1 |
|\ | | | | | Use Rubygems 2.6.14 to fix CVE-2017-0903 | ||||
| * | Use Rubygems 2.6.14 to fix CVE-2017-0903latest_rubygems | Tim Smith | 2017-10-18 | 1 | -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.22 | Chef Expeditor | 2017-10-18 | 5 | -11/+12 |
| | | |||||
* | | Merge pull request #6506 from chef/latest_ohai | Lamont Granquist | 2017-10-18 | 1 | -1/+1 |
|\ \ | | | | | | | Pull in Ohai 8.24.1 | ||||
| * | | Pull in Ohai 8.24.1latest_ohai | Tim Smith | 2017-10-18 | 1 | -1/+1 |
| |/ | | | | | | | Signed-off-by: Tim Smith <tsmith@chef.io> | ||||
* | | Bump version to 12.21.21 by Expeditorv12.21.21 | Chef Expeditor | 2017-10-18 | 5 | -10/+18 |
| | | |||||
* | | Merge pull request #6508 from chef/unbreak_12 | Tim Smith | 2017-10-18 | 1 | -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.3 | Tim Smith | 2017-10-18 | 1 | -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 stable | Chef Expeditor | 2017-10-18 | 1 | -15/+13 |
|/ | |||||
* | Bump version to 12.21.20 by Chef Expeditorv12.21.20 | Chef Expeditor | 2017-10-17 | 5 | -11/+12 |
| | |||||
* | Merge pull request #6500 from chef/btm/chef-12-dsc | Thom May | 2017-10-17 | 5 | -38/+182 |
|\ | | | | | MSYS-684: Added parser for DSC configuration | ||||
| * | MSYS-684: Added parser for DSC configurationbtm/chef-12-dsc | piyushawasthi | 2017-10-16 | 5 | -38/+182 |
| | | | | | | | | Signed-off-by: piyushawasthi <piyush.awasthi@msystechnologies.com> | ||||
* | | Bump version to 12.21.19 by Chef Expeditorv12.21.19 | Chef Expeditor | 2017-10-17 | 5 | -11/+12 |
| | | |||||
* | | Merge pull request #6501 from chef/lcg/bump-for-release | Lamont Granquist | 2017-10-16 | 1 | -1/+1 |
|\ \ | | | | | | | bump a copyright date to kick off a build | ||||
| * | | bump a copyright date to kick off a build | Lamont Granquist | 2017-10-16 | 1 | -1/+1 |
|/ / | | | | | | | Signed-off-by: Lamont Granquist <lamont@scriptkiddie.org> | ||||
* | | update copyright date in README to bump off a build | Lamont Granquist | 2017-10-16 | 1 | -1/+1 |
|/ | | | | Signed-off-by: Lamont Granquist <lamont@scriptkiddie.org> | ||||
* | Bump version to 12.21.18 by Chef Expeditorv12.21.18 | Chef Expeditor | 2017-10-16 | 5 | -11/+12 |
| | |||||
* | Merge pull request #6499 from chef/shain/chef-12-gemfix | Lamont Granquist | 2017-10-16 | 1 | -1/+1 |
|\ | | | | | Add environment/cwd to bundle freeze script | ||||
| * | Add environment/cwd to bundle freeze script | Scott Hain | 2017-10-16 | 1 | -1/+1 |
|/ | | | | Signed-off-by: Scott Hain <shain@chef.io> | ||||
* | Bump version to 12.21.17 by Chef Expeditorv12.21.17 | Chef Expeditor | 2017-10-12 | 5 | -11/+12 |
| | |||||
* | Merge pull request #6492 from chef/lcg/dnf-platform-tweaks-backport | Lamont Granquist | 2017-10-12 | 2 | -9/+19 |
|\ | | | | | backport of #6490 | ||||
| * | backport of #6490lcg/dnf-platform-tweaks-backport | Lamont Granquist | 2017-10-11 | 2 | -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.16 | Chef Expeditor | 2017-10-10 | 5 | -11/+12 |
| | |||||
* | Support new CriticalOhaiPlugins (backport #6486 to chef-12) (#6487) | Phil Dibowitz | 2017-10-09 | 2 | -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.15 | Chef Expeditor | 2017-10-04 | 5 | -11/+19 |
| | |||||
* | Merge pull request #6436 from NaomiReeves/backport_dnf_resource | Thom May | 2017-10-03 | 2 | -2/+7 |
|\ | | | | | Backport #6435 to Chef-12: dnf_resource | ||||
| * | fix tests | Naomi Reeves | 2017-09-28 | 1 | -1/+4 |
| | | | | | | | | Signed-off-by: Naomi Reeves <naomi.c.reeves@gmail.com> | ||||
| * | Backport #6435 to Chef-12: dnf_resource | Naomi Reeves | 2017-09-28 | 1 | -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-matching | Tom Duffield | 2017-09-29 | 1 | -2/+2 |
|\ \ | |/ |/| | [Expeditor] Use new glob-style version matching | ||||
| * | [Expeditor] Use new glob-style version matchingtduffield/expeditor/12-glob-matching | Tom Duffield | 2017-09-28 | 1 | -2/+2 |
| | | | | | | | | Signed-off-by: Tom Duffield <tom@chef.io> | ||||
* | | Merge pull request #6459 from chef/tests | Tim Smith | 2017-09-28 | 4 | -75/+63 |
|\ \ | | | | | | | Get the build green again | ||||
| * | | Remove testing of audit, halite, and chef-zero and test on latest rubies | Tim Smith | 2017-09-28 | 3 | -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 tests | Tim Smith | 2017-09-28 | 1 | -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 13 | Tim Smith | 2017-09-28 | 31 | -345/+82 |
|/ | | | | Signed-off-by: Tim Smith <tsmith@chef.io> | ||||
* | Merge pull request #6453 from chef/tduffield/chef-12/enable-changelog-management | Tim Smith | 2017-09-27 | 1 | -3/+9 |
|\ | | | | | Add tags so Expeditor can manage chef-12 changelog | ||||
| * | Add tags so Expeditor can manage chef-12 changelogtduffield/chef-12/enable-changelog-management | Tom Duffield | 2017-09-27 | 1 | -3/+9 |
|/ | | | | Signed-off-by: Tom Duffield <tom@chef.io> | ||||
* | Merge pull request #6452 from chef/tduffield/configure-docker-image | Tim Smith | 2017-09-27 | 1 | -0/+3 |
|\ | | | | | Fully configure Docker image in Expeditor | ||||
| * | Fully configure Docker image in Expeditor | Tom Duffield | 2017-09-27 | 1 | -0/+3 |
|/ | | | | Signed-off-by: Tom Duffield <tom@chef.io> |