summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Bump version to 14.0.23 by Expeditorv14.0.23Chef Expeditor2018-01-235-11/+12
* Merge pull request #6775 from chef/lcg/speed-up-http-func-testsLamont Granquist2018-01-233-19/+29
|\
| * speed up http func testslcg/speed-up-http-func-testsLamont Granquist2018-01-233-19/+29
* | Bump version to 14.0.22 by Expeditorv14.0.22Chef Expeditor2018-01-235-11/+12
* | Merge pull request #6776 from chef/revert-6766-lcg/windows-intervalLamont Granquist2018-01-234-36/+12
|\ \
| * | Revert "Fail on interval runs on windows"Lamont Granquist2018-01-234-36/+12
|/ /
* | Bump version to 14.0.21 by Expeditorv14.0.21Chef Expeditor2018-01-234-8/+8
* | Merge pull request #6773 from chef/revert-6770-tm/ruby_25Thom May2018-01-231-1/+1
|\ \
| * | Revert "Bump to ruby 2.5.0"Thom May2018-01-231-1/+1
|/ /
* | Bump version to 14.0.20 by Expeditorv14.0.20Chef Expeditor2018-01-235-12/+13
* | Merge pull request #6772 from chef/changelog_fixThom May2018-01-231-76/+80
|\ \
| * | Fix the changelog for the 13.7 releaseTim Smith2018-01-231-76/+80
* | | Bump version to 14.0.19 by Expeditorv14.0.19Chef Expeditor2018-01-235-11/+12
* | | Merge pull request #6770 from chef/tm/ruby_25Thom May2018-01-231-1/+1
|\ \ \ | |/ / |/| |
| * | Bump to ruby 2.5.0Thom May2018-01-231-1/+1
| |/
* | Bump version to 14.0.18 by Expeditorv14.0.18Chef Expeditor2018-01-235-11/+12
* | Merge pull request #6766 from chef/lcg/windows-intervalThom May2018-01-234-12/+36
|\ \
| * | fail on interval runs on windowslcg/windows-intervalLamont Granquist2018-01-224-11/+23
| * | This isn't chef-client, probably an old copy-pasta.Noah Kantrowitz2018-01-221-2/+2
| * | Add a warning about using --interval on Windows.Noah Kantrowitz2018-01-222-3/+15
* | | Bump version to 14.0.17 by Expeditorv14.0.17Chef Expeditor2018-01-235-11/+12
* | | Merge pull request #6656 from MsysTechnologiesllc/piyush/added_policy_name_an...Thom May2018-01-232-0/+201
|\ \ \
| * | | Added support for setting node policy name and group from knifepiyushawasthi2018-01-232-0/+201
| | |/ | |/|
* | | Merge pull request #6769 from chef/tm/proxy_testsThom May2018-01-231-0/+1
|\ \ \ | |/ / |/| |
| * | see what up with the proxy teststm/proxy_testsThom May2018-01-231-0/+1
|/ /
* | Bump version to 14.0.16 by Expeditorv14.0.16Chef Expeditor2018-01-235-11/+12
* | Merge pull request #6765 from chef/lcg/node-map-last-writer-winsLamont Granquist2018-01-227-62/+45
|\ \
| * | fix integration testslcg/node-map-last-writer-winsLamont Granquist2018-01-221-26/+26
| * | Convert node map to last-writer-wins for tiesLamont Granquist2018-01-226-36/+19
| |/
* | Bump version to 14.0.15 by Expeditorv14.0.15Chef Expeditor2018-01-225-11/+12
* | Merge pull request #6762 from chef/lcg/remove-node-setLamont Granquist2018-01-223-26/+2
|\ \
| * | Chef-14 Breaking: remove node.set and node.set_unlesslcg/remove-node-setLamont Granquist2018-01-223-26/+2
* | | Bump version to 14.0.14 by Expeditorv14.0.14Chef Expeditor2018-01-225-11/+12
* | | Merge pull request #6764 from chef/openssl_fixTim Smith2018-01-225-10/+10
|\ \ \ | |_|/ |/| |
| * | Rename the OpenSSL mixin to avoid name conflictsTim Smith2018-01-225-10/+10
|/ /
* | Bump version to 14.0.13 by Expeditorv14.0.13Chef Expeditor2018-01-225-11/+12
* | Merge pull request #6763 from chef/revert-6595-feature/add-action_create-to-w...Lamont Granquist2018-01-223-390/+44
|\ \
| * | Revert "add create and delete actions for windows_service"Lamont Granquist2018-01-223-390/+44
|/ /
* | Bump version to 14.0.12 by Expeditorv14.0.12Chef Expeditor2018-01-225-11/+12
* | Merge pull request #6515 from dimsh99/fix_for_6242Lamont Granquist2018-01-221-1/+1
|\ \
| * \ Merge branch 'master' of https://github.com/chef/chef into fix_for_6242Dmitry Shestoperov2017-11-2932-243/+279
| |\ \
| * \ \ Merge branch 'master' of github.com:dimsh99/chef into fix_for_6242Dmitry Shestoperov2017-11-2920-85/+255
| |\ \ \
| * | | | Simplified conversionDmitry Shestoperov2017-11-071-5/+1
| * | | | Action is converted to symbol if possibledmitrys2017-10-231-1/+5
* | | | | Bump version to 14.0.11 by Expeditorv14.0.11Chef Expeditor2018-01-225-11/+12
* | | | | Merge pull request #6595 from jasonwbarnett/feature/add-action_create-to-wind...Thom May2018-01-223-44/+390
|\ \ \ \ \
| * | | | | add :create, :delete, and :configure actions to the windows_service resource.Jason Barnett2017-11-233-44/+390
* | | | | | Bump version to 14.0.10 by Expeditorv14.0.10Chef Expeditor2018-01-225-11/+12
* | | | | | Merge pull request #6607 from andyfeller/knife-search-doc-quote-fixesThom May2018-01-223-15/+15
|\ \ \ \ \ \
| * \ \ \ \ \ Merge branch 'knife-search-doc-quote-fixes' of github.com:andyfeller/chef int...Andy Feller2017-11-280-0/+0
| |\ \ \ \ \ \