summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Fix failing specsjdm/3102Jay Mundrawala2015-04-161-1/+1
|
* Merge pull request #3135 from tomhughes/searchThom May2015-04-162-1/+25
|\ | | | | Ensure that a search query makes progress
| * Test that search queries make progressSteven Danna2015-03-251-0/+24
| |
| * Ensure that a search query makes progressTom Hughes2015-03-251-1/+1
| | | | | | | | | | | | | | | | If a search doesn't return a full result then increment the start pointer by the number of rows returned, rather than assuming that it was equal to the row limit, and defaulting to zero. This should fix #3099
* | Merge pull request #3102 from chef/btm/lower-json-nest-testsThom May2015-04-163-24/+9
|\ \ | | | | | | Reduce size of json nested entries
| * | Reduce size of json nested entriesBryan McLellan2015-04-153-24/+9
| | | | | | | | | | | | | | | | | | | | | | | | On FreeBSD 10.1 i386 we're seeing rspec 3.2.2 raise SystemStackError if the expect line has a nested hash of 255 levels. I'm going to guess we don't even need this many. I lowered this test from 1000 to 300 arbitrarily some time ago. Fixes #3101
* | | Merge pull request #3077 from chef/lcg/resource_priority_mapLamont Granquist2015-04-1520-86/+531
|\ \ \ | |/ / |/| | add resource_resolver and resource_priority_map
| * | add md filesLamont Granquist2015-04-152-0/+27
| | |
| * | move where we dep inject the priority mapsLamont Granquist2015-04-152-6/+7
| | | | | | | | | | | | | | | fixes the priority maps on chef-apply by wiring it up in the constructor of the client
| * | add resource_resolver and resource_priority_mapLamont Granquist2015-04-1518-86/+503
|/ / | | | | | | also wire them up through the Chef class.
* | Merge pull request #3210 from chef/awesome_community_chefsThom May2015-04-151-69/+89
|\ \ | | | | | | Awesome Community Chefs
| * | Blog links use chef.io domainawesome_community_chefsnathenharvey2015-04-101-68/+68
| | |
| * | 'recognized' is spelled correctlynathenharvey2015-04-101-1/+1
| | |
| * | Awesome Community Chefs are listed in the MVPS filenathenharvey2015-04-101-0/+20
| | |
* | | Merge pull request #3213 from chef/2140/jm/support_username_passwordJon Morrow2015-04-152-10/+64
|\ \ \ | | | | | | | | Fixes 2140 - Honor Proxy from Env
| * | | Fixes 2140 - Honor Proxy from EnvJon Morrow2015-04-142-10/+64
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change adds support to Chef's core http libs to honor a proxy uri set in the environment not just chef/knife config. It also adds support for username and password both in uri and env. The order of precidence for values is uri, config, env.
* | | | Merge pull request #3222 from chef/jdm/unpinJay Mundrawala2015-04-141-1/+1
|\ \ \ \ | | | | | | | | | | New bundler released
| * | | | New bundler releasedjdm/unpinJay Mundrawala2015-04-141-1/+1
|/ / / /
* | | | Merge pull request #3221 from jaymzh/chef3051clPhil Dibowitz2015-04-131-1/+3
|\ \ \ \ | | | | | | | | | | Changelog for PR#3051
| * | | | Changelog for PR#3051Phil Dibowitz2015-04-131-1/+3
|/ / / /
* | | | Merge pull request #3220 from chef/jdm/bundlerLamont Granquist2015-04-131-1/+1
|\ \ \ \ | | | | | | | | | | Pin bundler to 1.9.2 in appveyor.yml
| * | | | Pin bundler to 1.9.2 in appveyor.ymljdm/bundlerJay Mundrawala2015-04-131-1/+1
|/ / / / | | | | | | | | | | | | | | | | | | | | https://github.com/bundler/bundler/pull/3553 broke universal gems completely We can unpin once a fix is released
* | | | Merge pull request #3217 from chef/tm/fix_presenter_includeThom May2015-04-131-0/+1
|\ \ \ \ | | | | | | | | | | explicitly require node presenter
| * | | | explicitly require node presentertm/fix_presenter_includeThom May2015-04-131-0/+1
|/ / / /
* | | | Merge pull request #3051 from mikedodge04/macosx_service_updatePhil Dibowitz2015-04-113-233/+355
|\ \ \ \ | |/ / / |/| | | Load LaunchAgents as console user, adding plist and session_type options
| * | | adding assert for plistMike Dodge2015-04-012-5/+11
| | | |
| * | | fix some typos in commentsMike Dodge2015-03-261-2/+1
| | | |
| * | | moved around debugsMike Dodge2015-03-261-2/+1
| | | |
| * | | added requsted chagnesMike Dodge2015-03-263-5/+10
| | | |
| * | | addressed each of the commentsMike Dodge2015-03-253-20/+5
| | | |
| * | | removing vim comment (sorry its a habit to add)Mike Dodge2015-03-242-2/+0
| | | |
| * | | added tests for 100% of use casesMike Dodge2015-03-121-193/+201
| | | |
| * | | Updated tests to match new logicMike Dodge2015-03-121-17/+24
| | | |
| * | | First pass at fixing the unit testsMike Dodge2015-03-124-37/+67
| | | |
| * | | small change to the base user cmdMike Dodge2015-03-101-2/+1
| | | |
| * | | Merge branch 'macosx_service_update' of https://github.com/mikedodge04/chef ↵Mike Dodge2015-03-100-0/+0
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into macosx_service_update Conflicts: lib/chef/provider/service/macosx.rb
| | * | | Load LaunchAgents as console user, adding plist and session_type optionsMike Dodge2015-03-102-26/+73
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Proposed changes to chef mac osx service provider. This adds two resource parameters, @plist and @session_type and changes logic to Load LaunchAgents as Console user @plist: Adds the logic to handle (https://github.com/chef/chef/issues/2200) by Giving the user the option to pass a plist, in the case that the plist name and label name don't match. @session_type to help account launching the service as the console user with a different session type. ( Im a Facebook employee and PhilD will do the final merge. )
| * | | | Load LaunchAgents as console user, adding plist and session_type optionsMike Dodge2015-03-103-27/+113
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Proposed changes to chef mac osx service provider. This adds two resource parameters, @plist and @session_type and changes logic to Load LaunchAgents as Console user @plist: Adds the logic to handle (https://github.com/chef/chef/issues/2200) by Giving the user the option to pass a plist, in the case that the plist name and label name don't match. @session_type to help account launching the service as the console user with a different session type. ( Im a Facebook employee and PhilD will do the final merge. )
* | | | Merge branch 'machine_readable_maintainers'Thom May2015-04-102-135/+217
|\ \ \ \ | |_|/ / |/| | |
| * | | Catch up with latest maintainers actiontm/machine_readable_maintainersThom May2015-04-101-1/+11
| | | |
| * | | Switch MAINTAINERS to be a TOML docThom May2015-03-202-134/+207
| | | | | | | | | | | | | | | | | | | | This allows us to easily parse the maintainers file in a programatic way, for things like updating github teams, autoassigning reviewers.
* | | | Merge pull request #3067 from chef/tm/knife_status_environmentThom May2015-04-093-21/+112
|\ \ \ \ | | | | | | | | | | Allow knife status to filter by environment
| * | | | Just use a Time object in status teststm/knife_status_environmentThom May2015-04-091-1/+1
| | | | |
| * | | | Deal with the case where we're not partial searchThom May2015-04-091-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is only when the long_output flag is passed, which is probably never since I only just enabled it. But we document it, so it should really work…
| * | | | use real timesThom May2015-04-091-5/+5
| | | | |
| * | | | use partial searchThom May2015-04-083-20/+42
| | | | |
| * | | | Ensure valid lucene queriesThom May2015-03-162-5/+7
| | | | |
| * | | | Allow knife status to filter by environmentThom May2015-03-121-7/+18
| | | | | | | | | | | | | | | | | | | | This closes #3031 and also fixes a bug in handling custom queries
| * | | | Add tests for knife statusThom May2015-03-121-3/+58
| | | | | | | | | | | | | | | | | | | | Add failing tests for custom queries and environment filtering
* | | | | Merge pull request #3131 from ↵Thom May2015-04-082-1/+21
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | evertrue/evertrue/eherot/add_empty_check_for_ssh_hostname For knife ssh: Do not try to use item[:cloud][:public_hostname] for the hostname if it is empty