summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Bump version to 5.1.0jk/releaseJohn Keiser2016-09-072-3/+10
* Merge pull request #242 from chef/lcg/remove-create-additionsThom May2016-09-0640-63/+63
|\
| * remove create additions flaglcg/remove-create-additionsLamont Granquist2016-09-0240-63/+63
|/
* Revert "remove create additions flag"Lamont Granquist2016-09-0240-63/+63
* remove create additions flagLamont Granquist2016-09-0240-63/+63
* Merge pull request #240 from chef/mp/SPOOL-340Marc A. Paradise2016-09-013-14/+52
|\
| * store ACEs by client/usermp/SPOOL-340Marc Paradise2016-08-263-14/+52
|/
* Merge pull request #238 from chef/jk/bumpv5.0.0John Keiser2016-08-245-15/+23
|\
| * Bump rack to 2.xJohn Keiser2016-08-241-1/+1
| * Remove redundant master chef tests from TravisJohn Keiser2016-08-241-8/+9
| * Bump version to 5.0John Keiser2016-08-244-6/+13
|/
* Merge pull request #239 from chef/mp/SPOOL-197Marc A. Paradise2016-08-242-2/+12
|\
| * Support clients and users fields in ACL PUT requestsmp/SPOOL-197Marc Paradise2016-08-232-2/+12
* | Merge pull request #237 from chef/jk/ruby22John Keiser2016-08-232-14/+7
|\ \ | |/ |/|
| * Disable Ruby 2.1, bump dependencies accordinglyJohn Keiser2016-08-232-14/+7
|/
* Merge pull request #235 from chef/tm/4_9_0v4.9.0Thom May2016-08-112-3/+11
|\
| * Release 4.9.0tm/4_9_0Thom May2016-08-112-3/+11
|/
* Merge pull request #232 from chef/tm/test_more_rubbiesThom May2016-08-031-11/+25
|\
| * test ruby 2.2 and 2.3tm/test_more_rubbiesThom May2016-08-031-11/+25
* | Merge pull request #231 from chef/tm/run_more_pedantThom May2016-08-022-8/+13
|\ \ | |/ |/|
| * Enable policy, cookbook artifacts and ACL pedant teststm/run_more_pedantThom May2016-08-021-5/+6
| * Ensure that the cookbook version endpoint doesn't trip over itselfThom May2016-08-011-3/+7
|/
* Merge pull request #230 from chef/tm/styleThom May2016-07-29116-1321/+1329
|\
| * ChefStyletm/styleThom May2016-07-29116-1321/+1329
* | Merge pull request #229 from chef/tm/playground_portThom May2016-07-291-1/+1
|\ \ | |/ |/|
| * Connect to chef zero default port in the playgroundtm/playground_portThom May2016-07-291-1/+1
|/
* Merge pull request #228 from AntonOfTheWoods/syntax_fixThom May2016-07-281-2/+2
|\
| * Correct ruby syntax error to make script usableAnton Melser2016-07-271-2/+2
|/
* Release 4.8.0v4.8.0Thom May2016-07-252-3/+26
* Merge pull request #227 from chef/tm/recurse_librariesThom May2016-07-251-1/+1
|\
| * Load libraries recursivelytm/recurse_librariesThom May2016-07-251-1/+1
* | Merge pull request #225 from chef/badgesThom May2016-07-251-69/+78
|\ \ | |/ |/|
| * Add the latest CLI outputbadgesTim Smith2016-07-191-1/+7
| * Format readme, remove waffle badges, add licenseTim Smith2016-07-191-68/+71
* | Merge pull request #226 from chef/tm/fs_cache_resetThom May2016-07-231-0/+9
|\ \ | |/ |/|
| * Reset the ChefFS cache after each testtm/fs_cache_resetThom May2016-07-221-0/+9
|/
* Merge pull request #224 from chef/lcg/rebase-101Thom May2016-07-192-1/+13
|\
| * Return HTTP 400 Bad Request on Solr parse errorlcg/rebase-101Steven Danna2016-07-192-1/+13
* | Merge pull request #222 from maxlazio/suppress_rescue_log_levelThom May2016-07-191-1/+1
|\ \
| * | 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 namebyplayer2016-03-101-1/+2
* | | Merge pull request #175 from andrewdotn/masterThom May2016-07-192-4/+6
|\ \ \
| * | | 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_versionlcg/chef-version-supportLamont Granquist2015-10-201-3/+7
* | | | | Merge pull request #158 from amazon/dash-search-fixThom May2016-07-191-2/+2
|\ \ \ \ \
| * | | | | 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 Windowsaerii2015-07-091-1/+5