summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Port the travis fix from #6888one_moreTim Smith2018-02-282-13/+40
| | | | | | This fixes spec failures on this branch in Travis Signed-off-by: Tim Smith <tsmith@chef.io>
* More last Chef 12 dependency bumpTim Smith2018-02-282-46/+46
| | | | Signed-off-by: Tim Smith <tsmith@chef.io>
* 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 libxml2 to 2.9.7 and prep 12.22 release
| * Bump version to 12.22xmlTim Smith2018-02-202-1/+27
| | | | | | | | Signed-off-by: Tim Smith <tsmith@chef.io>
| * Update to libxml2 2.9.7Tim Smith2018-02-202-2/+2
|/ | | | | | This resolves https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2017-15412 Signed-off-by: Tim Smith <tsmith@chef.io>
* 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.
| * Use the version of LicenseScout that comes with the Omnibus gem.tduffield/license_scout/pin-1.xTom Duffield2018-02-082-26/+19
|/ | | | | | | LicenseScout is being refactored. We have released a 1.x version that is pinned within the Omnibus gem. Signed-off-by: Tom Duffield <tom@chef.io>
* 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
|\ | | | | Fix tests on AIX
| * missed oneLamont Granquist2018-01-311-1/+1
| | | | | | | | Signed-off-by: Lamont Granquist <lamont@scriptkiddie.org>
| * use TMPDIR correctly in initscriptLamont Granquist2018-01-311-4/+6
| | | | | | | | Signed-off-by: Lamont Granquist <lamont@scriptkiddie.org>
| * fix bff tests for tmpdirLamont Granquist2018-01-311-3/+3
|/ | | | Signed-off-by: Lamont Granquist <lamont@scriptkiddie.org>
* 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 #6746
| * backport #6746tm/fix_stupid_unixesThom May2018-01-311-1/+1
|/ | | | Signed-off-by: Thom May <thom@chef.io>
* 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 readme markdown
| * Format omnibus markdownchef_12_shipitTim Smith2018-01-301-52/+27
|/ | | | | | Trigger a new build since we saw failures in the previous build. Signed-off-by: Tim Smith <tsmith@chef.io>
* 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
|\ | | | | Fix Dockerfile & Travis/Appveyor failures
| * Split out Travis tests the same way we did for Chef 13fix_docker_buildsTim Smith2018-01-301-31/+80
| | | | | | | | | | | | This makes it easier to keep hitting retry until the unit tests pass. Signed-off-by: Tim Smith <tsmith@chef.io>
| * the format of this flametest doesn't matterLamont Granquist2018-01-301-21/+5
| | | | | | | | | | | | | | we don't need to test the exact output of this powershell command, just get literally anything that looks like it ran successfully. Signed-off-by: Lamont Granquist <lamont@scriptkiddie.org>
| * Fix Dockerfile to build off EL6 not EL5Tim Smith2018-01-301-2/+2
|/ | | | | | | | EL5 is EOL and we're not publishing these anymore. I also updated the default stable release to a current release. Not sure why that wasn't getting done. I doubt anyone uses this like this, but why not. Signed-off-by: Tim Smith <tsmith@chef.io>
* 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 versions
| * Update Ohai, omnibus, and Ruby versionsTim Smith2018-01-294-53/+51
|/ | | | | | | | | | ruby to resolve 2 CVEs ohai to 8.26.1 to fix docker detection and ec2 detection on new instance types omnibus to fix issues with ca-certs and the chef docker builds we produce Signed-off-by: Tim Smith <tsmith@chef.io>
* 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 acceptance changes
| * Backport 6673 to chef-12 branchshain/backport_git_docker_testsScott Hain2017-12-155-26/+5
|/ | | | Signed-off-by: Scott Hain <shain@chef.io>
* 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 openssl to 1.0.2.n
| * Update the lockfiles to pull in the new omnibusopenssl_and_othersTim Smith2017-12-132-26/+26
| | | | | | | | Signed-off-by: Tim Smith <tsmith@chef.io>
| * Update openssl to 1.0.2.nTim Smith2017-12-132-7/+7
|/ | | | | | Also properly update the omnibus_overrides file. I didn't regen this last time so the libs never updated. Signed-off-by: Tim Smith <tsmith@chef.io>
* 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
|\ | | | | Backport RHEL and ifconfig test fixes
| * Disable specific tests due to gem version issuesshain/backport_test_fixesScott Hain2017-12-121-8/+0
| | | | | | | | Signed-off-by: Scott Hain <shain@chef.io>
| * Fix whitespaceScott Hain2017-12-111-1/+1
| | | | | | | | Signed-off-by: Scott Hain <shain@chef.io>
| * Selectively update tests based on this PR: ↵Scott Hain2017-12-111-0/+6
| | | | | | | | | | | | https://github.com/chef/chef/commit/6b8130ad431fd61ce865734e7172efc3e0eba672#diff-37d7a2c7d1b1aa8bff687242c2753e97 Signed-off-by: Scott Hain <shain@chef.io>
| * Manually add platform specScott Hain2017-12-111-0/+10
| | | | | | | | Signed-off-by: Scott Hain <shain@chef.io>
| * Update gemfile locksScott Hain2017-12-111-93/+97
| | | | | | | | Signed-off-by: Scott Hain <shain@chef.io>
| * Update windows build gem informationScott Hain2017-12-111-1/+1
| | | | | | | | Signed-off-by: Scott Hain <shain@chef.io>
| * Don't try to uninstall bundler on appveyorBryan McLellan2017-12-111-3/+0
| | | | | | | | | | | | | | | | | | | | As of Rubygems 2.7 bundler is a default gem and cannot be uninstalled. Appveyor recently (11/19) changed and now has bundler as a default gem. We'll stop stop trying to force a bundler version and track what Ruby gives us. Signed-off-by: Bryan McLellan <btm@loftninjas.org>
| * Fix ifconfig spec to reflect new codeScott Hain2017-12-111-8/+3
| | | | | | | | Signed-off-by: Scott Hain <shain@chef.io>
| * Updated with examples for versions of ifconfigScott Hain2017-12-111-0/+20
| | | | | | | | Signed-off-by: Scott Hain <shain@chef.io>
| * Don't run ifconfig tests on RHEL7, as it is not part of the base OSScott Hain2017-12-112-6/+7
| | | | | | | | Signed-off-by: Scott Hain <shain@chef.io>
| * Add creation of ramdisk node if it doesn't already existScott Hain2017-12-111-0/+4
| | | | | | | | Signed-off-by: Scott Hain <shain@chef.io>
| * Turns out there are multiple versions of net-tools with completely different ↵Scott Hain2017-12-111-29/+67
| | | | | | | | | | | | output patterns. Signed-off-by: Scott Hain <shain@chef.io>
View Lorry Controller Status