Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | testjdm/test-kec2 | Jay Mundrawala | 2015-04-22 | 1 | -0/+1 |
| | |||||
* | Merge pull request #3254 from chef/jdm/12.4.0.dev12.4.0.dev.0 | Thom May | 2015-04-22 | 1 | -1/+1 |
|\ | | | | | 12.4.0.dev.0 for master | ||||
| * | 12.4.0.dev.0 for masterjdm/12.4.0.dev | Jay Mundrawala | 2015-04-21 | 1 | -1/+1 |
|/ | |||||
* | Document changes from merges | Thom May | 2015-04-21 | 1 | -0/+6 |
| | |||||
* | Merge pull request #3214 from chef/tc/chef_key_object | Tyler Cloke | 2015-04-20 | 3 | -0/+831 |
|\ | | | | | Chef Key Object | ||||
| * | Implemented the Key object corrosponding to key rotation API endpoint.tc/chef_key_object | tylercloke | 2015-04-20 | 3 | -0/+831 |
|/ | |||||
* | Update CHANGELOG for merges | Bryan McLellan | 2015-04-20 | 1 | -3/+6 |
| | |||||
* | Address review comments from @btm | Julian C. Dunn | 2015-04-20 | 1 | -7/+3 |
| | |||||
* | Address review comment ↵ | Julian C. Dunn | 2015-04-20 | 1 | -18/+0 |
| | | | | https://github.com/chef/chef/pull/2877#discussion_r26357870 | ||||
* | Several bugs found during testing: | Julian C. Dunn | 2015-04-20 | 1 | -2/+3 |
| | | | | | | | | | | | | * Use -o option in curl to send the install.sh to a file. This way stderr/stdout can be reserved for errors like "curl: not found", ensuring it is captured. * On AIX, ksh was shell-substituting $ARGV[0] before script interpretation, so use a shift() trick to avoid the $ * If the chef-client binary doesn't exist at all, then avoid proceeding with the rest of should_update_chef() Tested on: AIX 7.1 + sudo, FreeBSD 10 + ca_root_nss + sudo | ||||
* | Gotta do something with that stderr we so carefully captured. | Julian C. Dunn | 2015-04-20 | 1 | -0/+5 |
| | |||||
* | Copy more robust routines from Omnitruck installer. | Julian C. Dunn | 2015-04-20 | 1 | -31/+86 |
| | | | | Put knife bootstrap proxy options back in the right place. | ||||
* | Rebase and resolve conflicts. | Julian C. Dunn | 2015-04-20 | 1 | -22/+126 |
| | |||||
* | Volunteer to assist as a FreeBSD maintainer. | the Bunny Man | 2015-04-20 | 1 | -2/+9 |
| | | | | I would be happy to help maintain chef's FreeBSD support. | ||||
* | Fix nil pointer for windows event logger | Jay Mundrawala | 2015-04-20 | 2 | -5/+25 |
| | | | | | It is possible for the run to fail and no run_status to even have been set. This resolves issue #2996 | ||||
* | Merge pull request #3247 from chef/btm/lower-json-nest-tests | Bryan McLellan | 2015-04-20 | 3 | -9/+9 |
|\ | | | | | Reduce size of nested JSON test to 252 deep | ||||
| * | 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 |
| | | | |