summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Don't bother installing integration test gemsjk/pin-chef-pedantJohn Keiser2016-09-081-0/+10
* Bring in cucumber to prevent cucumber-core from being wrongly loadedJohn Keiser2016-09-083-4/+14
* Pin oc-chef-pedant to prevent unintended test slippageJohn Keiser2016-09-082-0/+44
* Bump version of chef to 12.14.57 by Chef Versioner.v12.14.57Chef Versioner2016-09-084-8/+8
* Merge pull request #5295 from chef/update-depsMatt Wrock2016-09-072-18/+104
|\
| * yet another dependency update PRupdate-depsMatt Wrock2016-09-072-18/+104
|/
* Bump version of chef to 12.14.56 by Chef Versioner.v12.14.56Chef Versioner2016-09-074-8/+8
* Merge pull request #5291 from chef/lcg/document-voodooLamont Granquist2016-09-072-0/+20
|\
| * also add a big comment to the Chef::Knife codeLamont Granquist2016-09-071-0/+6
| * document the bizzare :knife sub-hash situationLamont Granquist2016-09-071-0/+14
|/
* Bump version of chef to 12.14.55 by Chef Versioner.v12.14.55Chef Versioner2016-09-074-8/+8
* Merge pull request #5234 from MsysTechnologiesllc/ali/allow_symlink_directory...Bryan McLellan2016-09-073-3/+199
|\
| * Added functional RSpecs for the fix added here for symlink issue on windows.aliasgar162016-09-071-0/+34
| * Fixed RuboCop issues.aliasgar162016-09-011-35/+35
| * Added RSpecs for the fix.aliasgar162016-09-011-0/+155
| * Added code to handle deletion of directories on Windows that are symlinks.aliasgar162016-08-231-3/+10
* | Bump version of chef to 12.14.54 by Chef Versioner.v12.14.54Chef Versioner2016-09-074-8/+8
* | Merge pull request #5289 from chef/lcg/knife-options-readabilityThom May2016-09-071-20/+18
|\ \
| * | readability improvements to options parsing codelcg/knife-options-readabilityLamont Granquist2016-09-061-20/+18
|/ /
* | Bump version of chef to 12.14.53 by Chef Versioner.v12.14.53Chef Versioner2016-09-064-8/+8
* | Merge pull request #5281 from coderanger/recipe_file_loadedNoah Kantrowitz2016-09-065-9/+52
|\ \
| * | Thanks, Windows.Noah Kantrowitz2016-09-061-1/+3
| * | Fix dispatcher tests.Noah Kantrowitz2016-09-061-2/+2
| * | Hook up the recipe_file_loaded event which was defined but not actually called.Noah Kantrowitz2016-09-024-7/+48
* | | Bump version of chef to 12.14.52 by Chef Versioner.v12.14.52Chef Versioner2016-09-064-8/+8
* | | Merge pull request #5279 from chef/lcg/fix-solo-spec-testLamont Granquist2016-09-061-6/+11
|\ \ \
| * | | use threads to workaround Process.spawn buginesslcg/fix-solo-spec-testLamont Granquist2016-09-021-6/+11
* | | | Bump version of chef to 12.14.51 by Chef Versioner.v12.14.51Chef Versioner2016-09-064-8/+8
* | | | Merge pull request #5182 from erikng/masterThom May2016-09-061-1/+1
|\ \ \ \
| * | | | Add Hash type to launchd:keep_aliveErik Gomez2016-08-081-1/+1
* | | | | Bump version of chef to 12.14.50 by Chef Versioner.v12.14.50Chef Versioner2016-09-064-8/+8
* | | | | Merge pull request #5250 from MsysTechnologiesllc/dh/add_timeout_during_packa...Bryan McLellan2016-09-062-1/+10
|\ \ \ \ \
| * | | | | Added spec for Timeout function in Windows remove package codedheerajd-msys2016-09-061-0/+9
| * | | | | Added timeout during removing of windows packagedheerajd-msys2016-08-261-1/+1
* | | | | | Bump version of chef to 12.14.49 by Chef Versioner.v12.14.49Chef Versioner2016-09-054-8/+8
* | | | | | Merge pull request #5284 from chef/remove_branchesMatt Wrock2016-09-052-32/+21
|\ \ \ \ \ \
| * | | | | | remove kitchen-inspec and train pins in acceptanceremove_branchesMatt Wrock2016-09-052-32/+21
|/ / / / / /
* | | | | | Bump version of chef to 12.14.48 by Chef Versioner.v12.14.48Chef Versioner2016-09-024-8/+8
* | | | | | Merge pull request #5280 from chef/bump_configMatt Wrock2016-09-022-2/+2
|\ \ \ \ \ \
| * | | | | | bumping configMatt Wrock2016-09-022-2/+2
|/ / / / / /
* | | | | | Bump version of chef to 12.14.47 by Chef Versioner.v12.14.47Chef Versioner2016-09-024-8/+8
* | | | | | Merge pull request #5278 from chef/bumpsMatt Wrock2016-09-023-37/+31
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | bump tk in acceptance and omnibus-software for ruby patchMatt Wrock2016-09-023-37/+31
* | | | | | Bump version of chef to 12.14.46 by Chef Versioner.v12.14.46Chef Versioner2016-09-024-8/+8
* | | | | | Merge pull request #5276 from chef/lcg/solo-test-loop-tweakingLamont Granquist2016-09-021-4/+4
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | tweak chef-solo run_lock timing testlcg/solo-test-loop-tweakingLamont Granquist2016-09-021-4/+4
|/ / / / /
* | | | | Bump version of chef to 12.14.45 by Chef Versioner.v12.14.45Chef Versioner2016-09-024-8/+8
* | | | | Merge pull request #5260 from chef/lcg/openssl-1.0.2Lamont Granquist2016-09-024-10/+11
|\ \ \ \ \
| * | | | | bump omnibus-software againlcg/openssl-1.0.2Lamont Granquist2016-09-011-1/+1
| * | | | | remove bundle update of license_scoutLamont Granquist2016-09-011-2/+1