summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Stop logging "SIGQUIT is not a command" in testsjkeiser-patch-1John Keiser2016-08-181-3/+2
* Bump version of chef to 12.14.12 by Chef Versioner.v12.14.12Chef Versioner2016-08-174-8/+8
* Merge pull request #5219 from chef/sersut/json-license-overrideJohn Keiser2016-08-171-1/+1
|\
| * Pick up the license_scout version that overrides the license information for ...Serdar Sutay2016-08-171-1/+1
|/
* Bump version of chef to 12.14.11 by Chef Versioner.v12.14.11Chef Versioner2016-08-174-8/+8
* Merge pull request #5190 from chef/jk/ruby23John Keiser2016-08-173-25/+24
|\
| * Use Ruby 2.3.1 in Travis and AppveyorJohn Keiser2016-08-172-24/+23
| * Use Ruby 2.3.1John Keiser2016-08-171-1/+1
|/
* Bump version of chef to 12.14.10 by Chef Versioner.v12.14.10Chef Versioner2016-08-174-8/+8
* Merge pull request #5217 from chef/jk/fix-styleLamont Granquist2016-08-172-3/+1
|\
| * Update to latest chefstyleJohn Keiser2016-08-172-3/+1
|/
* Bump version of chef to 12.14.9 by Chef Versioner.v12.14.9Chef Versioner2016-08-174-8/+8
* Merge pull request #5216 from chef/jk/symlinks-ruby23-windowsJohn Keiser2016-08-171-9/+21
|\
| * Fix symlink tests on Ruby 2.3 on WindowsJohn Keiser2016-08-171-9/+21
* | Bump version of chef to 12.14.8 by Chef Versioner.v12.14.8Chef Versioner2016-08-174-8/+8
* | Merge pull request #5212 from chef/jk/runlock-raceJohn Keiser2016-08-171-4/+8
|\ \ | |/ |/|
| * Fix race where lockfile can be created but not yet acquiredJohn Keiser2016-08-171-4/+8
|/
* Bump version of chef to 12.14.7 by Chef Versioner.v12.14.7Chef Versioner2016-08-174-8/+8
* Merge pull request #5202 from chef/sersut/transitive-dep-licensingSerdar Sutay2016-08-1718-17/+45
|\
| * Pick up omnibus and omnibus-software that supports including licensing inform...sersut/transitive-dep-licensingSerdar Sutay2016-08-1618-17/+45
* | Bump version of chef to 12.14.6 by Chef Versioner.v12.14.6Chef Versioner2016-08-174-8/+8
* | Merge pull request #5215 from chef/jk/windows-ruby-2.3John Keiser2016-08-172-22/+84
|\ \
| * | Don't use relative_path_from on glob resultsjk/windows-ruby-2.3John Keiser2016-08-162-22/+84
* | | Bump version of chef to 12.14.5 by Chef Versioner.v12.14.5Chef Versioner2016-08-174-8/+8
* | | Merge pull request #5196 from chef/lcg/more-copsThom May2016-08-1777-682/+671
|\ \ \ | |/ / |/| |
| * | fix Style/StructInheritance coplcg/more-copsLamont Granquist2016-08-161-5/+5
| * | disable Style/OptionalArgumentsLamont Granquist2016-08-161-1/+1
| * | fix Style/VariableName copLamont Granquist2016-08-162-4/+4
| * | fix some Style/ExtraSpacing that crept into this patchLamont Granquist2016-08-162-3/+3
| * | fixes Style/OpMethod copLamont Granquist2016-08-165-17/+17
| * | fixing Style/MultilineTernaryOperator copLamont Granquist2016-08-168-19/+29
| * | fix some Style/TrailingWhitespaceLamont Granquist2016-08-161-30/+30
| * | fixing Style/ConstantName copLamont Granquist2016-08-165-9/+9
| * | fixing Lint/Void copLamont Granquist2016-08-164-13/+13
| * | fix Lint/UselessAccessModifier copLamont Granquist2016-08-166-251/+246
| * | fix Lint/UnderscorePrefixedVariableName copLamont Granquist2016-08-162-10/+10
| * | "fix" Lint/NestedMethodDefinition copsLamont Granquist2016-08-165-8/+8
| * | autofixing Style/WhileUntilModifier copLamont Granquist2016-08-166-24/+8
| * | autofixing Style/SpaceBeforeSemicolon copLamont Granquist2016-08-166-8/+8
| * | autofixing Style/SpaceBeforeComment copLamont Granquist2016-08-162-3/+3
| * | auotfixing Style/SpaceAfterSemicolon copLamont Granquist2016-08-163-7/+7
| * | autofixing Style/RedundantException copLamont Granquist2016-08-168-9/+9
| * | autofixing Style/MultilineIfThen copLamont Granquist2016-08-164-6/+6
| * | autofixing Style/IndentAssignment copLamont Granquist2016-08-164-296/+296
| * | autofixing Style/AccessModifierIndentation copLamont Granquist2016-08-168-8/+8
| * | autofixing Performance/TimesMapLamont Granquist2016-08-162-2/+2
|/ /
* | Bump version of chef to 12.14.4 by Chef Versioner.v12.14.4Chef Versioner2016-08-164-8/+8
* | Merge pull request #5214 from chef/lcg/greenify-testsLamont Granquist2016-08-161-0/+2
|\ \
| * | omit this chef-provisioning testLamont Granquist2016-08-161-0/+2
|/ /
* | Bump version of chef to 12.14.3 by Chef Versioner.v12.14.3Chef Versioner2016-08-164-8/+8