summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Load cookbook versions correctly for knifetm/fix_cb_showThom May2016-05-162-100/+95
* Bump version of chef to 12.10.54 by Chef Versioner.v12.10.54Chef Versioner2016-05-164-12/+12
* Merge pull request #4919 from chef/tm/zoloThom May2016-05-1623-129/+185
|\
| * move legacy config into a separate functiontm/zoloThom May2016-05-161-26/+29
| * remove dead commentThom May2016-05-161-1/+0
| * Ensure that legacy mode and local mode workThom May2016-05-161-90/+120
| * Ensure that solo specific code is run at the proper timeThom May2016-05-1622-39/+43
| * default to using local modeThom May2016-05-161-28/+48
|/
* Bump version of chef to 12.10.53 by Chef Versioner.v12.10.53Chef Versioner2016-05-144-9/+9
* Merge pull request #4933 from chef/lcg/better-handler-wiringLamont Granquist2016-05-142-0/+120
|\
| * wire up chef handlers directly from librarieslcg/better-handler-wiringLamont Granquist2016-05-132-0/+120
* | Bump version of chef to 12.10.52 by Chef Versioner.v12.10.52Chef Versioner2016-05-144-8/+8
* | Merge pull request #4907 from nathwill/systemd-unit-valid-iniThom May2016-05-142-1/+36
|\ \
| * | reject malformed ini contentNathan Williams2016-05-132-1/+36
* | | Bump version of chef to 12.10.51 by Chef Versioner.v12.10.51Chef Versioner2016-05-134-9/+9
* | | Merge pull request #4932 from chef/schisamo/fix-acceptance-archivingSeth Chisamore2016-05-131-5/+7
|\ \ \
| * | | Execute chef-acceptance without elevated privilegesSeth Chisamore2016-05-131-5/+7
|/ / /
* | | Bump version of chef to 12.10.50 by Chef Versioner.v12.10.50Chef Versioner2016-05-134-8/+8
* | | Merge pull request #4931 from chef/appxMatt Wrock2016-05-131-0/+4
|\ \ \
| * | | add appx block with signing key to omnibus projectMatt Wrock2016-05-131-0/+4
| | |/ | |/|
* | | Bump version of chef to 12.10.49 by Chef Versioner.v12.10.49Chef Versioner2016-05-134-8/+8
* | | Merge pull request #4923 from chef/adamedx/fix-docker-acceptance-breakAdam Edwards2016-05-131-3/+0
|\ \ \ | |/ / |/| |
| * | Disable Docker cookbook acceptance tests until the cookbook or Chef is fixed.adamedx/fix-docker-acceptance-breakAdam Edwards2016-05-131-3/+0
|/ /
* | Bump version of chef to 12.10.48 by Chef Versioner.v12.10.48Chef Versioner2016-05-134-8/+8
* | Merge pull request #4929 from chef/lcg/gem-metadata-clear-pathsLamont Granquist2016-05-121-0/+1
|\ \
| * | gem metadata command needs Gem.clear_pathslcg/gem-metadata-clear-pathsLamont Granquist2016-05-121-0/+1
* | | Bump version of chef to 12.10.47 by Chef Versioner.v12.10.47Chef Versioner2016-05-125-28/+20
* | | Merge pull request #4921 from achand/profile_provider_fixPhil Dibowitz2016-05-121-3/+2
|\ \ \ | |/ / |/| |
| * | fix build errorsAjay Chand2016-05-101-2/+2
| * | fix profile provider for nilAjay Chand2016-05-101-5/+4
* | | Bump version of chef to 12.10.46 by Chef Versioner.v12.10.46Chef Versioner2016-05-124-9/+9
* | | Merge branch 'lcg/kitchen-tests2'Lamont Granquist2016-05-1214-33/+291
|\ \ \
| * | | fixing nits from PRlcg/kitchen-tests2Lamont Granquist2016-05-123-8/+6
| * | | fix a few issues in the diffLamont Granquist2016-05-113-3/+3
| * | | add centos and more func testing to travisLamont Granquist2016-05-1115-33/+293
|/ / /
* | | Bump version of chef to 12.10.45 by Chef Versioner.v12.10.45Chef Versioner2016-05-114-13/+13
* | | Merge pull request #4925 from chef/lcg/changelog-remove-issuesLamont Granquist2016-05-111-0/+1
|\ \ \
| * | | remove issues from changelog generatorLamont Granquist2016-05-111-0/+1
|/ / /
* | | Bump version of chef to 12.10.44 by Chef Versioner.v12.10.44Chef Versioner2016-05-114-9/+9
* | | Merge pull request #4898 from joshburt/jb_git_new_resource_destination_to_cwdLamont Granquist2016-05-111-14/+13
|\ \ \ | |/ / |/| |
| * | Based on feedback from PR, usage was changed over to a Forwardable / def_dele...Joshua C. Burt2016-05-111-4/+3
| * | Merge branch 'master' into jb_git_new_resource_destination_to_cwdJoshua C. Burt2016-05-1167-406/+593
| |\ \ | |/ / |/| |
* | | Merge pull request #4917 from chef/schisamo/update-acceptance-data-dirSeth Chisamore2016-05-101-4/+4
|\ \ \
| * | | Add `KITCHEN_CHEF_CHANNEL` value now `ARTIFACTORY_USERNAME` that was removedSeth Chisamore2016-05-101-1/+1
| * | | Write chef-acceptance data to the Jenkins `$WORKSPACE`Seth Chisamore2016-05-101-1/+1
| * | | Remove legacy `ARTIFACTORY_*` env variablesSeth Chisamore2016-05-101-4/+4
* | | | Bump version of chef to 12.10.43 by Chef Versioner.v12.10.43Chef Versioner2016-05-104-8/+8
* | | | Merge pull request #4867 from willoucom/untar-under-windowsThom May2016-05-101-2/+7
|\ \ \ \ | |/ / / |/| | |
| * | | messages in log.debugWilfried JEANNIARD2016-05-041-2/+2
| * | | code cleanupWilfried JEANNIARD2016-05-031-4/+3