summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Bump version of chef to 12.14.14 by Chef Versioner.v12.14.14Chef Versioner2016-08-184-8/+8
* Merge pull request #5222 from chef/lcg/solo-test-speedupLamont Granquist2016-08-181-20/+6
|\
| * use the chef log file for IPClcg/solo-test-speedupLamont Granquist2016-08-181-7/+8
| * speed up solo testLamont Granquist2016-08-181-16/+1
* | Bump version of chef to 12.14.13 by Chef Versioner.v12.14.13Chef Versioner2016-08-184-8/+8
* | Merge pull request #5218 from chef/lcg/more-more-copsLamont Granquist2016-08-18184-1636/+1722
|\ \ | |/ |/|
| * fix private methods that weren't privateLamont Granquist2016-08-181-37/+46
| * rearrange private/public add @api privateLamont Granquist2016-08-181-11/+25
| * add an @api private commentLamont Granquist2016-08-181-0/+1
| * stray Lint/UselessAccessModifierlcg/more-more-copsLamont Granquist2016-08-171-2/+0
| * fix Style/BlockDelimiters, Style/MultilineBlockLayout and 0.42.0 engine upgradeLamont Granquist2016-08-17184-1588/+1652
* | 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