summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* fix knife diff exceptionsbackport_11Lamont Granquist2019-05-291-12/+11
* Bump version to 14.12.13 by Chef Expeditorv14.12.13Chef Expeditor2019-05-295-11/+12
* Merge pull request #8601 from chef/openssl_14Tim Smith2019-05-293-57/+101
|\
| * Update openssl to 1.0.2sTim Smith2019-05-293-57/+101
|/
* Bump version to 14.12.12 by Chef Expeditorv14.12.12Chef Expeditor2019-05-245-11/+12
* Merge pull request #8587 from chef/btm/14-MSYS-976Lamont Granquist2019-05-236-3/+251
|\
| * Fix service enable idempotency in sles11 (#8256)btm/14-MSYS-976dheerajd-msys2019-05-236-3/+251
* | Bump version to 14.12.11 by Chef Expeditorv14.12.11Chef Expeditor2019-05-245-11/+12
* | Merge pull request #8511 from chef/remove_deprecationsTim Smith2019-05-235-93/+22
|\ \ | |/ |/|
| * Cleanup merge artifactsremove_deprecationsTim Smith2019-05-172-16/+4
| * update outdated description on preview resourcesLamont Granquist2019-05-171-4/+3
| * Remove resource collision deprecationsLamont Granquist2019-05-175-86/+28
|/
* Bump version to 14.12.10 by Chef Expeditorv14.12.10Chef Expeditor2019-05-175-14/+22
* Merge pull request #8565 from chef/jsinha/add_local_updateversionBryan McLellan2019-05-172-1/+22
|\
| * Add chef-14 update_version scriptjsinha/add_local_updateversionJaymala Sinha2019-05-172-1/+22
|/
* Merge pull request #8564 from chef/btm/14-expeditorTim Smith2019-05-171-48/+0
|\
| * Remove commented workloads from Expeditor config.ymlBryan McLellan2019-05-171-48/+0
|/
* Merge pull request #8526 from chef/btm/14-MSYS-996Bryan McLellan2019-05-177-96/+176
|\
| * Fix travis platforms and remove poise on travisBryan McLellan2019-05-172-25/+5
| * remove chef-bin when downgradingBryan McLellan2019-05-171-0/+1
| * Add chef version debug info in the kitchen testsbtm/14-MSYS-996Tim Smith2019-05-171-2/+8
| * Merge the local and travis kitchen tests into a single configTim Smith2019-05-173-55/+129
| * cruft cleanupLamont Granquist2019-05-171-11/+3
| * pull tarballs from githubLamont Granquist2019-05-171-2/+2
| * use lifecycle hooks and kitchen-dokken 2.xLamont Granquist2019-05-172-14/+16
| * Fix for Chef::Exceptions::Win32APIError: The operation completed successfullyKapil Chouhan2019-05-172-1/+26
|/
* Merge pull request #8559 from chef/jsinha/add_verify_pipelineTim Smith2019-05-166-0/+206
|\
| * Remove poise testsjsinha/add_verify_pipelineJaymala Sinha2019-05-161-11/+0
| * Enable license acceptance for kitchen testsJaymala Sinha2019-05-162-0/+2
| * Add BK public verify pipelineJaymala Sinha2019-05-164-0/+215
|/
* Merge pull request #8530 from chef/turn_off_subsTim Smith2019-05-131-48/+48
|\
| * Turn off version bump subscriptionsTim Smith2019-05-131-48/+48
|/
* Merge pull request #8510 from chef/fix_win_featureTim Smith2019-05-101-1/+1
|\
| * Fix for chef 14 windows_feature fails on windows 2008r2fix_win_featureKapil Chouhan2019-05-081-1/+1
|/
* Update CHANGELOG.md to reflect the promotion of 14.12.9Chef Expeditor2019-04-202-17/+14
* Bump version to 14.12.9 by Chef Expeditorv14.12.9Chef Expeditor2019-04-195-11/+12
* Merge pull request #8402 from chef/sync_with_chef_14Tim Smith2019-04-191-5/+5
|\
| * Sync the CLI option descriptions between chef-client and chef-soloTim Smith2019-04-191-5/+5
* | Bump version to 14.12.8 by Chef Expeditorv14.12.8Chef Expeditor2019-04-195-11/+12
* | Merge pull request #8401 from chef/better_errorsTim Smith2019-04-195-8/+8
|\ \
| * | Break the error message into 2 sentencesTim Smith2019-04-195-8/+8
| * | Improve the error message when no config can be loadedTim Smith2019-04-195-8/+8
| |/
* | Bump version to 14.12.7 by Chef Expeditorv14.12.7Chef Expeditor2019-04-195-11/+12
* | Merge pull request #8400 from chef/whitelist_blacklist_14Tim Smith2019-04-193-58/+52
|\ \ | |/ |/|
| * fix default/override attribute blacklists and whitelistsLamont Granquist2019-04-193-58/+52
|/
* Bump version to 14.12.6 by Chef Expeditorv14.12.6Chef Expeditor2019-04-195-11/+12
* Merge pull request #8398 from chef/license_flagTim Smith2019-04-194-0/+20
|\
| * Add placeholder license acceptance flagsTim Smith2019-04-194-0/+20
|/
* Bump version to 14.12.5 by Chef Expeditorv14.12.5Chef Expeditor2019-04-175-11/+12
* Merge pull request #8387 from chef/win32Tim Smith2019-04-172-32/+29
|\