summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* enable Lint/PercentStringArraylcg/rubocop.ymlLamont Granquist2017-08-242-3/+1
* add .rubocop.yml to disable newly enabled chefstyle copsLamont Granquist2017-08-241-0/+26
* Bump version to 13.3.50 by Chef Expeditorv13.3.50Chef Expeditor2017-08-175-12/+13
* Merge pull request #6339 from chef/tas50-patch-1Tim Smith2017-08-171-5/+20
|\
| * Add v12.21.4 to master's changelogTim Smith2017-08-171-5/+20
|/
* Bump version to 13.3.49 by Chef Expeditorv13.3.49Chef Expeditor2017-08-175-11/+12
* Merge pull request #6334 from chef/more_changelogTim Smith2017-08-171-0/+112
|\
| * Add Chef 13.0.113 and 13.0.118 to the changelogmore_changelogTim Smith2017-08-141-0/+112
* | Bump version to 13.3.48 by Chef Expeditorv13.3.48Chef Expeditor2017-08-175-12/+13
* | Merge pull request #6295 from MsysTechnologiesllc/nim/windows_pathTim Smith2017-08-177-0/+272
|\ \
| * | Using FFI instead of Win32apinimisha2017-08-162-44/+19
| * | Fixing Appveyor issuesnimisha2017-08-163-2/+26
| * | Fixed specsnimisha2017-08-165-5/+173
| * | Added windows_path resourcenimisha2017-08-164-0/+105
* | | Bump version to 13.3.47 by Chef Expeditorv13.3.47Chef Expeditor2017-08-165-12/+15
* | | Merge pull request #6314 from chef/btm/chef-shell-jsonTim Smith2017-08-163-62/+87
|\ \ \
| * | | Unit tests for json attribs and chef-shellbtm/chef-shell-jsonBryan McLellan2017-08-101-58/+82
| * | | Pass json configuration to ShellSession classJon Cowie2017-08-102-4/+5
* | | | Merge pull request #6316 from twk3/deep-merge-preserve-vivid-nilTim Smith2017-08-162-1/+8
|\ \ \ \
| * | | | Fix rubocop styling issue in node_specDJ Mountney2017-08-111-1/+1
| * | | | Fix an issue where DeepMerge overwrites nil valuesDJ Mountney2017-08-102-1/+8
| |/ / /
* | | | Update CHANGELOG.md to reflect the promotion of 13.3.42 to stableChef Expeditor2017-08-162-21/+26
| |/ / |/| |
* | | Bump version to 13.3.46 by Chef Expeditorv13.3.46Chef Expeditor2017-08-155-11/+12
* | | Merge pull request #6331 from coderanger/required-errorNoah Kantrowitz2017-08-152-1/+13
|\ \ \ | |_|/ |/| |
| * | And fix the resource name.Noah Kantrowitz2017-08-131-1/+1
| * | Better spec label.Noah Kantrowitz2017-08-131-1/+1
| * | Ignore validation errors in Resource#to_text.Noah Kantrowitz2017-08-132-1/+13
* | | Bump version to 13.3.45 by Chef Expeditorv13.3.45Chef Expeditor2017-08-145-11/+12
* | | Merge pull request #6327 from chef/chef_12_changelogTim Smith2017-08-131-16/+26
|\ \ \ | |/ / |/| |
| * | Catch Chef 12 changelog up to current 12 releasechef_12_changelogTim Smith2017-08-111-16/+26
|/ /
* | Bump version to 13.3.44 by Chef Expeditorv13.3.44Chef Expeditor2017-08-115-11/+12
* | Merge pull request #6326 from chef/notes3Tim Smith2017-08-111-2/+3
|\ \
| * | Fix bad examples in the release notesTim Smith2017-08-111-2/+3
* | | Bump version to 13.3.43 by Chef Expeditorv13.3.43Chef Expeditor2017-08-115-11/+12
* | | Merge pull request #6325 from chef/notes3Tim Smith2017-08-111-4/+24
|\ \ \ | |/ /
| * | Improve apt_preference docsTim Smith2017-08-111-2/+2
| * | Add more items to the 13.3 release notesnotes3Tim Smith2017-08-111-3/+23
|/ /
* | Bump version to 13.3.42 by Chef Expeditorv13.3.42Chef Expeditor2017-08-115-12/+12
* | Merge pull request #6324 from chef/adamleff/bump-inspecAdam Leff2017-08-111-5/+6
|\ \
| * | Bump InSpec to v1.33.1Adam Leff2017-08-111-5/+6
|/ /
* | Bump version to 13.3.41 by Chef Expeditorv13.3.41Chef Expeditor2017-08-115-11/+12
* | Merge pull request #6297 from takaya-fuj19/fixdocTim Smith2017-08-101-2/+6
|\ \
| * | README improvement for Chef beginner.Takaya Fujimaki2017-07-291-2/+6
* | | Merge pull request #6321 from chef/preference_actionTim Smith2017-08-102-2/+2
|\ \ \
| * | | Fix the apt_preference action to be removepreference_actionTim Smith2017-08-102-2/+2
* | | | Bump version to 13.3.40 by Chef Expeditorv13.3.40Chef Expeditor2017-08-115-11/+12
* | | | Merge pull request #6318 from chef/zypper2Tim Smith2017-08-102-1/+17
|\ \ \ \
| * | | | Don't use provides twiceTim Smith2017-08-101-1/+0
| * | | | Maintain compat with old zypper_repo resource used in cookbookszypper2Tim Smith2017-08-102-0/+17
* | | | | Bump version to 13.3.39 by Chef Expeditorv13.3.39Chef Expeditor2017-08-115-11/+12