summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* - 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 #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
|\ \
| * | Enable progress output to be configuredtm/remote_file_download_progressThom May2016-03-049-26/+66
| * | Merge branch 'remote-file-download-progress' of https://github.com/brandocorp...Thom May2016-03-035-2/+90
| |\ \
| | * | fix broken specsBrandon Raabe2015-03-211-1/+1
| | * | new doc formatter event, remove progress barBrandon Raabe2015-03-205-82/+69
| | * | pass resource as an option to allow access to resource eventsBrandon Raabe2015-03-182-10/+21
| | * | add progress interval, add ProgressBar classBrandon Raabe2015-03-153-2/+74
| | * | read content length from the response and use to show overall statusBrandon Raabe2015-03-151-1/+4
| | * | add value of show_progress to the http_client_optsBrandon Raabe2015-03-151-0/+8
| | * | add show_progress attributeBrandon Raabe2015-03-151-0/+8
* | | | Merge pull request #4640 from chef/tm/zero_deep_librariesThom May2016-03-154-2/+7
|\ \ \ \
| * | | | Ensure that chef-zero loads libraries recursivelytm/zero_deep_librariesThom May2016-03-034-2/+7
| |/ / /
* | | | Bump version to 12.9.0John Keiser2016-03-154-3/+5
* | | | Merge pull request #4712 from chef/no_winMatt Wrock2016-03-151-6/+8
|\ \ \ \
| * | | | temporarily disabling windows and chocolatey to eliminate transient errors on...Matt Wrock2016-03-151-6/+8
|/ / / /
* | | | Merge pull request #4711 from chef/tm/rake_depThom May2016-03-151-0/+3
|\ \ \ \
| * | | | ensure we always can raketm/rake_depThom May2016-03-151-0/+3
|/ / / /
* | | | Merge pull request #4707 from chef/lcg/useless-assignmentLamont Granquist2016-03-1514-19/+13
|\ \ \ \
| * | | | fix some UselessAssignment caseslcg/useless-assignmentLamont Granquist2016-03-1414-21/+15
| | |_|/ | |/| |
* | | | Merge pull request #4706 from chef/lcg/chefstyle-andorLamont Granquist2016-03-1574-151/+150
|\ \ \ \
| * | | | fix windows specslcg/chefstyle-andorLamont Granquist2016-03-141-2/+2
| * | | | fix specsLamont Granquist2016-03-141-3/+3
| * | | | change to break unlessLamont Granquist2016-03-141-1/+2
| * | | | remove unnecessary variableLamont Granquist2016-03-141-2/+2
| * | | | remove parensLamont Granquist2016-03-141-1/+1
| * | | | manual fixing for raise unlessLamont Granquist2016-03-145-15/+13
| * | | | fix `or return` to `return unless`Lamont Granquist2016-03-141-1/+1
| * | | | This commit is why AndOr needs to be bannedLamont Granquist2016-03-142-6/+6
| * | | | chefstyle Style/AndOr fixesLamont Granquist2016-03-1473-144/+144
| |/ / /
* | | | Merge pull request #4684 from chef/cd/fix-spurious-warningsChris Doherty2016-03-143-5/+33
|\ \ \ \ | |/ / / |/| | |
| * | | Issue 4334: Because set(property, nil) gets turned into get(property), add a ...cd/fix-spurious-warningsChris Doherty2016-03-113-5/+33
* | | | Merge pull request #4693 from nathwill/bugfix/thread-exclusiveLamont Granquist2016-03-111-3/+1
|\ \ \ \
| * | | | rm unnecessary mutexNathan Williams2016-03-111-4/+1
| * | | | fix deprecated Thread.exclusive with MutexNathan Williams2016-03-101-1/+2
* | | | | Merge pull request #4699 from chef/move_pryMatt Wrock2016-03-111-4/+6
|\ \ \ \ \
| * | | | | moving pry gems to their own very special groupMatt Wrock2016-03-111-4/+6
|/ / / / /
* | | | | Merge pull request #4696 from chef/lcg/yell-at-usersLamont Granquist2016-03-111-0/+3
|\ \ \ \ \
| * | | | | this is a really, really bad setting to tweaklcg/yell-at-usersLamont Granquist2016-03-111-0/+3
| | |/ / / | |/| | |
* | | | | Merge pull request #4692 from chef/salam/mount-fixSalim Alam2016-03-112-0/+18
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Update specSalim Alam2016-03-111-0/+12