summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Use parallel-suites branch of acceptance for testingtest-parallel-suitesdanielsdeleo2016-03-241-1/+1
* Pin all lower-level libs to latest versionsupdate-omnibus-libsdanielsdeleo2016-03-221-0/+24
* Bump version of chef to 12.8.3 by Chef Versioner.v12.8.3Chef Versioner2016-03-223-3/+3
* Add --force-destroy to chef-acceptancedanielsdeleo2016-03-221-1/+1
* Bump version of chef to 12.8.2 by Chef Versioner.v12.8.2Chef Versioner2016-03-223-3/+3
* reset release notes for 12.9Matt Wrock2016-03-221-0/+3
* Merge pull request #4732 from chef/lcg/use-inline-resources-coreLamont Granquist2016-03-226-95/+47
|\
| * release notes text tweaks [ci skip]lcg/use-inline-resources-coreLamont Granquist2016-03-211-5/+4
| * add a release note [ci skip]Lamont Granquist2016-03-211-72/+24
| * remove caller[0]Lamont Granquist2016-03-211-3/+3
| * back out the to_s.to_s hackLamont Granquist2016-03-211-5/+1
| * add back the converge_by textLamont Granquist2016-03-211-2/+6
| * allow use_inline_resources for core chef providersLamont Granquist2016-03-216-29/+30
* | Merge pull request #4727 from chef/salam/fix-proxySalim Alam2016-03-2110-11/+101
|\ \
| * | Fix Rubocop error in package_taskSalim Alam2016-03-211-1/+1
| * | Fix proxified socketSalim Alam2016-03-218-16/+70
| * | Update config specSalim Alam2016-03-214-1/+25
| * | Override no_proxy with internal matcherSalim Alam2016-03-213-3/+15
|/ /
* | Change acceptance test tag so old instances will be reapeddanielsdeleo2016-03-211-1/+1
* | Add version:bump and version:show tasks for version-bump-botjk/version-bumperJohn Keiser2016-03-214-10/+32
|/
* Subtle differences in the plist gem break tests so lock to 3.2+danielsdeleo2016-03-211-1/+1
* Update launchd spec for doctype changedanielsdeleo2016-03-211-1/+1
* Make example classes #to_s method return a stringdebug-travis-provider-resolver-faildanielsdeleo2016-03-212-2/+2
* Merge pull request #4725 from chef/lcg/dsl-rearrangementLamont Granquist2016-03-214-67/+136
|\
| * rearrange dsl mixinslcg/dsl-rearrangementLamont Granquist2016-03-184-67/+136
* | Merge pull request #4721 from chef/lcg/force-ffi-windowsLamont Granquist2016-03-181-1/+5
|\ \
| * | set FORCE_FFI_YAJL on windows spec testslcg/force-ffi-windowsLamont Granquist2016-03-171-1/+5
* | | Merge pull request #4726 from chef/relax-plist-constraintLamont Granquist2016-03-181-1/+1
|\ \ \
| * | | Allow any 3.x version of plistdanielsdeleo2016-03-181-1/+1
* | | | Merge pull request #4348 from chef/nls/proxy-cleanupChris Doherty2016-03-187-199/+210
|\ \ \ \
| * | | | - Restore previous behavior where we use the user/pass from the URI, if present.nls/proxy-cleanupChris Doherty2016-03-172-4/+12
| * | | | Rubocop.Chris Doherty2016-03-173-14/+13
| * | | | Make handling of proxies more consistentNathan L Smith2016-03-177-205/+209
| | |/ / | |/| |
* | | | Merge pull request #4722 from chef/lcg/remove-readline-libeditLamont Granquist2016-03-181-1/+1
|\ \ \ \ | |_|/ / |/| | |
| * | | revert bumping to 2.2.4Lamont Granquist2016-03-181-1/+1
| * | | use rb-readlin on unix as well as windowsLamont Granquist2016-03-171-2/+2
| |/ /
* | | Merge pull request #4714 from chef/cd/log-platformJordan Running2016-03-184-1/+100
|\ \ \ | |_|/ |/| |
| * | Log platform in pretty error outputcd/log-platformJordan Running2016-03-183-1/+99
| * | Log platform along with client version and pid.Chris Doherty2016-03-171-0/+1
| |/
* | Merge pull request #4719 from chef/lcg/deprecate-fulldslLamont Granquist2016-03-174-23/+21
|\ \ | |/ |/|
| * rub some YARD on deprecation commentLamont Granquist2016-03-171-1/+1
| * deprecate Chef::DSL::Recipe::FullDSLlcg/deprecate-fulldslLamont Granquist2016-03-164-23/+21
|/
* Merge pull request #4717 from chef/revert_verMatt Wrock2016-03-163-3/+3
|\
| * reverting version to 12.8.1 temporarily to avoid rerelease of ohaiMatt Wrock2016-03-163-3/+3
|/
* Merge pull request #4701 from mawinter69/masterThom May2016-03-161-4/+6
|\
| * remove unnecessary whitespaceMarkus Winter2016-03-151-2/+2
| * fix for https://github.com/chef/chef/issues/4689Markus Winter2016-03-121-4/+6
* | Merge pull request #4674 from chef/lcg/use-and-lazy-module-includeLamont Granquist2016-03-157-3/+226
|\ \
| * | lazy module inclusion into DSL moduleslcg/use-and-lazy-module-includeLamont Granquist2016-03-157-3/+226
|/ /
* | Merge pull request #4658 from chef/tm/remote_file_download_progress11.9Thom May2016-03-159-2/+130
|\ \