Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Reduce size of nested JSON test to 252 deepbtm/lower-json-nest-tests | Bryan McLellan | 2015-04-20 | 3 | -9/+9 |
| | | | | | | I got confused running git on the tester with my last commit for #3101. This should clean it up. | ||||
* | Merge pull request #3238 from chef/jdm/solaris | Jay Mundrawala | 2015-04-17 | 1 | -1/+3 |
|\ | | | | | Unit testify shell_spec | ||||
| * | Unit testify shell_specjdm/solaris | Jay Mundrawala | 2015-04-17 | 1 | -1/+3 |
|/ | |||||
* | Merge pull request #3236 from chef/jdm/3102 | Jay Mundrawala | 2015-04-16 | 1 | -1/+1 |
|\ | | | | | Fix failing specs | ||||
| * | Fix failing specsjdm/3102 | Jay Mundrawala | 2015-04-16 | 1 | -1/+1 |
|/ | |||||
* | Merge pull request #3135 from tomhughes/search | Thom May | 2015-04-16 | 2 | -1/+25 |
|\ | | | | | Ensure that a search query makes progress | ||||
| * | Test that search queries make progress | Steven Danna | 2015-03-25 | 1 | -0/+24 |
| | | |||||
| * | Ensure that a search query makes progress | Tom Hughes | 2015-03-25 | 1 | -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-tests | Thom May | 2015-04-16 | 3 | -24/+9 |
|\ \ | | | | | | | Reduce size of json nested entries | ||||
| * | | Reduce size of json nested entries | Bryan McLellan | 2015-04-15 | 3 | -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_map | Lamont Granquist | 2015-04-15 | 20 | -86/+531 |
|\ \ \ | |/ / |/| | | add resource_resolver and resource_priority_map | ||||
| * | | add md files | Lamont Granquist | 2015-04-15 | 2 | -0/+27 |
| | | | |||||
| * | | move where we dep inject the priority maps | Lamont Granquist | 2015-04-15 | 2 | -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_map | Lamont Granquist | 2015-04-15 | 18 | -86/+503 |
|/ / | | | | | | | also wire them up through the Chef class. | ||||
* | | Merge pull request #3210 from chef/awesome_community_chefs | Thom May | 2015-04-15 | 1 | -69/+89 |
|\ \ | | | | | | | Awesome Community Chefs | ||||
| * | | Blog links use chef.io domainawesome_community_chefs | nathenharvey | 2015-04-10 | 1 | -68/+68 |
| | | | |||||
| * | | 'recognized' is spelled correctly | nathenharvey | 2015-04-10 | 1 | -1/+1 |
| | | | |||||
| * | | Awesome Community Chefs are listed in the MVPS file | nathenharvey | 2015-04-10 | 1 | -0/+20 |
| | | | |||||
* | | | Merge pull request #3213 from chef/2140/jm/support_username_password | Jon Morrow | 2015-04-15 | 2 | -10/+64 |
|\ \ \ | | | | | | | | | Fixes 2140 - Honor Proxy from Env | ||||
| * | | | Fixes 2140 - Honor Proxy from Env | Jon Morrow | 2015-04-14 | 2 | -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/unpin | Jay Mundrawala | 2015-04-14 | 1 | -1/+1 |
|\ \ \ \ | | | | | | | | | | | New bundler released | ||||
| * | | | | New bundler releasedjdm/unpin | Jay Mundrawala | 2015-04-14 | 1 | -1/+1 |
|/ / / / | |||||
* | | | | Merge pull request #3221 from jaymzh/chef3051cl | Phil Dibowitz | 2015-04-13 | 1 | -1/+3 |
|\ \ \ \ | | | | | | | | | | | Changelog for PR#3051 | ||||
| * | | | | Changelog for PR#3051 | Phil Dibowitz | 2015-04-13 | 1 | -1/+3 |
|/ / / / | |||||
* | | | | Merge pull request #3220 from chef/jdm/bundler | Lamont Granquist | 2015-04-13 | 1 | -1/+1 |
|\ \ \ \ | | | | | | | | | | | Pin bundler to 1.9.2 in appveyor.yml | ||||
| * | | | | Pin bundler to 1.9.2 in appveyor.ymljdm/bundler | Jay Mundrawala | 2015-04-13 | 1 | -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_include | Thom May | 2015-04-13 | 1 | -0/+1 |
|\ \ \ \ | | | | | | | | | | | explicitly require node presenter | ||||
| * | | | | explicitly require node presentertm/fix_presenter_include | Thom May | 2015-04-13 | 1 | -0/+1 |
|/ / / / | |||||
* | | | | Merge pull request #3051 from mikedodge04/macosx_service_update | Phil Dibowitz | 2015-04-11 | 3 | -233/+355 |
|\ \ \ \ | |/ / / |/| | | | Load LaunchAgents as console user, adding plist and session_type options | ||||
| * | | | adding assert for plist | Mike Dodge | 2015-04-01 | 2 | -5/+11 |
| | | | | |||||
| * | | | fix some typos in comments | Mike Dodge | 2015-03-26 | 1 | -2/+1 |
| | | | | |||||
| * | | | moved around debugs | Mike Dodge | 2015-03-26 | 1 | -2/+1 |
| | | | | |||||
| * | | | added requsted chagnes | Mike Dodge | 2015-03-26 | 3 | -5/+10 |
| | | | | |||||
| * | | | addressed each of the comments | Mike Dodge | 2015-03-25 | 3 | -20/+5 |
| | | | | |||||
| * | | | removing vim comment (sorry its a habit to add) | Mike Dodge | 2015-03-24 | 2 | -2/+0 |
| | | | | |||||
| * | | | added tests for 100% of use cases | Mike Dodge | 2015-03-12 | 1 | -193/+201 |
| | | | | |||||
| * | | | Updated tests to match new logic | Mike Dodge | 2015-03-12 | 1 | -17/+24 |
| | | | | |||||
| * | | | First pass at fixing the unit tests | Mike Dodge | 2015-03-12 | 4 | -37/+67 |
| | | | | |||||
| * | | | small change to the base user cmd | Mike Dodge | 2015-03-10 | 1 | -2/+1 |
| | | | | |||||
| * | | | Merge branch 'macosx_service_update' of https://github.com/mikedodge04/chef ↵ | Mike Dodge | 2015-03-10 | 0 | -0/+0 |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into macosx_service_update Conflicts: lib/chef/provider/service/macosx.rb | ||||
| | * | | | Load LaunchAgents as console user, adding plist and session_type options | Mike Dodge | 2015-03-10 | 2 | -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 options | Mike Dodge | 2015-03-10 | 3 | -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 May | 2015-04-10 | 2 | -135/+217 |
|\ \ \ \ | |_|/ / |/| | | | |||||
| * | | | Catch up with latest maintainers actiontm/machine_readable_maintainers | Thom May | 2015-04-10 | 1 | -1/+11 |
| | | | | |||||
| * | | | Switch MAINTAINERS to be a TOML doc | Thom May | 2015-03-20 | 2 | -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_environment | Thom May | 2015-04-09 | 3 | -21/+112 |
|\ \ \ \ | | | | | | | | | | | Allow knife status to filter by environment | ||||
| * | | | | Just use a Time object in status teststm/knife_status_environment | Thom May | 2015-04-09 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Deal with the case where we're not partial search | Thom May | 2015-04-09 | 1 | -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 times | Thom May | 2015-04-09 | 1 | -5/+5 |
| | | | | | |||||
| * | | | | use partial search | Thom May | 2015-04-08 | 3 | -20/+42 |
| | | | | |