summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* test ruby 2.2 and 2.3tm/test_more_rubbiesThom May2016-08-031-11/+25
| | | | Signed-off-by: Thom May <thom@may.lt>
* Merge pull request #230 from chef/tm/styleThom May2016-07-29116-1321/+1329
|\ | | | | ChefStyle
| * ChefStyletm/styleThom May2016-07-29116-1321/+1329
| | | | | | | | Signed-off-by: Thom May <thom@may.lt>
* | Merge pull request #229 from chef/tm/playground_portThom May2016-07-291-1/+1
|\ \ | |/ |/| Connect to chef zero default port in the playground
| * Connect to chef zero default port in the playgroundtm/playground_portThom May2016-07-291-1/+1
|/ | | | | Fixes: #128 Signed-off-by: Thom May <thom@may.lt>
* Merge pull request #228 from AntonOfTheWoods/syntax_fixThom May2016-07-281-2/+2
|\ | | | | Correct ruby syntax error to make script usable
| * Correct ruby syntax error to make script usableAnton Melser2016-07-271-2/+2
|/
* Release 4.8.0v4.8.0Thom May2016-07-252-3/+26
| | | | Signed-off-by: Thom May <thom@may.lt>
* Merge pull request #227 from chef/tm/recurse_librariesThom May2016-07-251-1/+1
|\ | | | | Load libraries recursively
| * Load libraries recursivelytm/recurse_librariesThom May2016-07-251-1/+1
| | | | | | | | | | | | Fixes #161 Signed-off-by: Thom May <thom@may.lt>
* | Merge pull request #225 from chef/badgesThom May2016-07-251-69/+78
|\ \ | |/ |/| Format readme, remove waffle badges, add license
| * Add the latest CLI outputbadgesTim Smith2016-07-191-1/+7
| | | | | | | | Signed-off-by: Tim Smith <tsmith@chef.io>
| * Format readme, remove waffle badges, add licenseTim Smith2016-07-191-68/+71
| | | | | | | | Signed-off-by: Tim Smith <tsmith@chef.io>
* | Merge pull request #226 from chef/tm/fs_cache_resetThom May2016-07-231-0/+9
|\ \ | |/ |/| Reset the ChefFS cache after each test
| * Reset the ChefFS cache after each testtm/fs_cache_resetThom May2016-07-221-0/+9
|/ | | | Signed-off-by: Thom May <thom@may.lt>
* Merge pull request #224 from chef/lcg/rebase-101Thom May2016-07-192-1/+13
|\ | | | | Return HTTP 400 Bad Request on Solr parse error
| * Return HTTP 400 Bad Request on Solr parse errorlcg/rebase-101Steven Danna2016-07-192-1/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, chef-zero would return an HTTP 500 Internal Server Error when the Solr parser failed. Now, we return HTTP 400 with an error message identical to that of the Erchef server. Returning HTTP 400 also improves the end-user experience since knife returns more sensible error messages. Before this patch: > knife search nodes 'recipes:bar::bar' ERROR: Server returned error 500 for http://127.0.0.1:8889/search... After: > knife search nodes 'recipes:bar::bar' ERROR: knife search failed: invalid search query: 'recipes:bar::bar'
* | Merge pull request #222 from maxlazio/suppress_rescue_log_levelThom May2016-07-191-1/+1
|\ \ | | | | | | Set log level to debug in the rescue block.
| * | Set log level to debug in the rescue block.Marin Jankovski2016-07-071-1/+1
| |/
* | Merge pull request #204 from byplayer/feature/uri_escapeThom May2016-07-191-1/+2
|\ \ | | | | | | support URI specific character in file name
| * | support URI specific character in file namebyplayer2016-03-101-1/+2
| | |
* | | Merge pull request #175 from andrewdotn/masterThom May2016-07-192-4/+6
|\ \ \ | | | | | | | | Fix attempted fall-through in case statement.
| * | | Fix attempted fall-through in case statement.Andrew Neitsch2015-11-252-4/+6
| | | |
* | | | Merge pull request #171 from chef/lcg/chef-version-supportThom May2016-07-191-3/+7
|\ \ \ \ | | | | | | | | | | add patch to support chef_version
| * | | | add patch to support chef_versionlcg/chef-version-supportLamont Granquist2015-10-201-3/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | most of our metadata is the form of: key "value" but chef_version can be: chef_version ">= 12.3.1", "< 13.0.0" so we need a splat in method messing and need to shovel it into an array. relates to chef/chef#4081
* | | | | Merge pull request #158 from amazon/dash-search-fixThom May2016-07-191-2/+2
|\ \ \ \ \ | | | | | | | | | | | | Fix scary search behavior on terms containing dash character
| * | | | | Fix scary search behavior on terms containing dash characterSergey Tuchkin2015-08-171-2/+2
| | | | | |
* | | | | | Merge pull request #148 from aerii/update-error-messageThom May2016-07-191-1/+5
|\ \ \ \ \ \ | | | | | | | | | | | | | | Update error message for daemon on Windows
| * | | | | | Update error message for daemon on Windowsaerii2015-07-091-1/+5
| | | | | | | | | | | | | | | | | | | | | When running chef-zero with the daemon option on Windows, the error message incorrectly says 'Process.daemon requires Ruby >= 1.9', even when Windows has Ruby 2.0+.
* | | | | | | Merge pull request #139 from cl-lab-k/add_normal_tagsThom May2016-07-191-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | add normal tags with empty array
| * | | | | | | add normal tags with empty arrayHIGUCHI Daisuke2015-06-021-1/+1
| | | | | | | |
* | | | | | | | Merge pull request #138 from kongslund/request-timeoutThom May2016-07-192-0/+5
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Increase WEBrick request timeout to 300 seconds. Fixes #137
| * | | | | | | | Increase WEBrick request timeout to 300 seconds. Fixes #137Jonas Kongslund2015-05-272-0/+5
| |/ / / / / / /
* | | | | | | | Merge pull request #109 from schrodinger/proxy-awareThom May2016-07-191-1/+7
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Make ChefZero aware of load balancers
| * | | | | | | | Make ChefZero aware of load balancersJoshua Kwan2014-12-151-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We have some complex reasons to hide a ChefZero behind an nginx proxy. One problem that suddenly arose with this is that URLs returned by posting to /environment/foo/cookbook_versions use the protocol of the internal webrick which is always plain http. This causes the chef client to retrieve these urls on the https port but with an encrypted payload. Support this situation by using the HTTP_X_FORWARDED_PROTO CGI variable if it is available.
* | | | | | | | | Merge pull request #106 from higanworks/disable_sslv3Thom May2016-07-191-0/+12
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ |/| | | | | | | | disable sslv3 and few unsecure options
| * | | | | | | | disable sslv3 and few unsecure optionssawanoboly2014-11-271-0/+12
| |/ / / / / / /
* | | | | | | | Release 4.7.1v4.7.1Thom May2016-07-072-3/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Thom May <thom@may.lt>
* | | | | | | | Merge pull request #221 from stanhu/suppress-request-info-logThom May2016-07-071-1/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Downgrade info log message to debug
| * | | | | | | | Downgrade info log message to debugStan Hu2016-07-061-1/+1
|/ / / / / / / /
* | | | | | | | Merge pull request #220 from chef/4.7.0v4.7.0Tim Smith2016-06-302-7/+17
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Release 4.7.0
| * | | | | | | | Release 4.7.0Tim Smith2016-06-302-7/+17
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Tim Smith <tsmith@chef.io>
* | | | | | | | Merge pull request #219 from chef/rackTim Smith2016-06-301-5/+5
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Depend on rack < 2 to restore Ruby 2.1 compat
| * | | | | | | | Depend on rack < 2 to restore Ruby 2.1 compatTim Smith2016-06-301-5/+5
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rack 2.0.1 was just released and it requires Ruby 2.2+ Signed-off-by: Tim Smith <tsmith@chef.io>
* | | | | | | | Merge pull request #217 from chef/saml/et-205Stephan Renatus2016-06-091-11/+21
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Add external_authentication_uid to actors endpoint for querying
| * | | | | | | | Add external_authentication_uid to actors endpoint for queryingsaml/et-205kmacgugan2016-06-091-11/+21
|/ / / / / / / /
* | | | | | | | Release v4.6.2v4.6.2Steven Danna2016-04-282-2/+10
| | | | | | | |
* | | | | | | | Merge pull request #216 from chef/ssd/log_response-at-debugSteven Danna2016-04-231-1/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Log responses only at debug log level
| * | | | | | | | Log responses only at debug log levelssd/log_response-at-debugSteven Danna2016-04-221-1/+1
|/ / / / / / / /
* | | | | | | | Bump version to 4.6.1v4.6.1John Keiser2016-04-142-3/+11
| | | | | | | |