summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Don't pollute global Chef server optionsjk/chef_server_optionsJohn Keiser2015-04-061-4/+5
* Updating chef dependency to latest released versionv4.2.0tyler-ball2015-04-061-3/+3
* Updating changelog and version for 4.2.0 releasetyler-ball2015-04-062-2/+10
* Merge pull request #119 from chef/jk/org_and_scopeTyler Ball2015-04-061-222/+225
|\
| * Add :organization and :data_scope options to with_chef_serverjk/org_and_scopeJohn Keiser2015-03-191-222/+225
* | Merge pull request #124 from chef/lcg/bump-ffi-yajlLamont Granquist2015-04-021-1/+1
|\ \
| * | bump ffi-yajl depLamont Granquist2015-04-021-1/+1
|/ /
* | Bump to 4.1.0 to release socketless modev4.1.0danielsdeleo2015-04-011-1/+1
* | Add socketless to CHANGELOGdanielsdeleo2015-04-011-1/+3
* | Merge branch 'socketless'danielsdeleo2015-04-014-3/+180
|\ \
| * | Extract socketless server map and add specssocketlessdanielsdeleo2015-03-303-47/+156
| * | Initial implementation of socketless requestsdanielsdeleo2015-03-272-3/+71
|/ /
* | Partially Revert 1b2a6e5f107254cce8200a4750035b30265ae0c8partial-revert-1b2a6e5f107254cce8200a4750035b30265ae0c8danielsdeleo2015-03-271-4/+4
* | Merge pull request #113 from jaymzh/versionTyler Ball2015-03-265-77/+121
|\ \ | |/ |/|
| * Support /version; fix some global URIsPhil Dibowitz2015-03-265-77/+121
|/
* repair badges after opscode->chef renameJulian C. Dunn2015-03-011-1/+1
* Merge branch 'policyfile-revision-id'danielsdeleo2015-02-272-17/+45
|\
| * Update to pedant 1.0.46policyfile-revision-iddanielsdeleo2015-02-261-1/+1
| * Update validation messages to match erchefdanielsdeleo2015-02-251-19/+34
| * Validate that revision_id is not emptydanielsdeleo2015-02-231-0/+2
| * Policyfile revision_id field is mandatory, validate formatdanielsdeleo2015-02-231-1/+12
|/
* Bump pedant to 1.0.44 for RSpec 3.2 compatibilitycompatible-chef-versiondanielsdeleo2015-02-212-2/+4
* Use a Chef version compatible with chef-zero 4.xdanielsdeleo2015-02-201-1/+1
* Bump revision to 4.0v4.0John Keiser2015-02-112-1/+6
* Add nicer rspec formatJohn Keiser2015-02-111-0/+2
* Merge policyfile endpointsJohn Keiser2015-02-1110-26/+161
|\
| * Remove unsupported ruby from travispolicyfile-get-set-apidanielsdeleo2015-01-281-20/+10
| * Check before create/update to determine correct status codedanielsdeleo2015-01-281-10/+9
| * Update pedant and chef to mutually compatible versionsdanielsdeleo2015-01-281-2/+3
| * Filter out some oc-pedant tests that aren't supporteddanielsdeleo2015-01-281-0/+3
| * Set backtraces on "nested" exceptionsdanielsdeleo2015-01-271-2/+6
| * Update bundle and test config for latest pedantdanielsdeleo2015-01-273-7/+7
| * Add policies endpointdanielsdeleo2015-01-202-1/+129
| * Show invalid data in error messagedanielsdeleo2015-01-201-1/+1
| * Add desc to rake tasks so you can see them in rake -Tdanielsdeleo2015-01-191-0/+3
| * REVERT ME - use local copy of pedant for nowdanielsdeleo2015-01-191-1/+8
|/
* Merge pull request #105 from opscode/sersut/rel-3.2.1v3.2.1Serdar Sutay2014-11-261-1/+1
|\
| * Version bump for 3.2.1.Serdar Sutay2014-11-261-1/+1
|/
* Merge pull request #103 from jaymzh/logfileSerdar Sutay2014-11-261-0/+9
|\
| * Add option for logging to a file.Phil Dibowitz2014-11-241-0/+9
* | Merge pull request #104 from higanworks/87_fix_responce_uri_schemeSerdar Sutay2014-11-261-0/+1
|\ \ | |/ |/|
| * fix: should set https to rack.url_scheme #87sawanoboly2014-11-251-0/+1
|/
* Merge pull request #96 from opscode/nls/CORSJohn Ewart2014-10-211-0/+3
|\
| * add CORS headernls/CORSNathan L Smith2014-10-181-0/+3
|/
* Bump revision to 3.2v3.2John Keiser2014-09-262-2/+2
* Merge pull request #93 from opscode/tball/chef-zero-yajl-replace-jsonJohn Keiser2014-09-2655-149/+153
|\
| * Removing 'json' gem dependency, replacing with 'ffi-yajl'tball/chef-zero-yajl-replace-jsontyler-ball2014-09-2655-149/+153
|/
* Bump revision to 3.1.3v3.1.3John Keiser2014-09-032-1/+5
* Merge branch 'base_uri'John Keiser2014-09-033-9/+6
|\
| * Handle exceptional conditions where stops are being called all overJohn Keiser2014-09-031-2/+2