summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #1284 from opscode/sd/couchdb-create-speeduppl-masterStephen Delano2014-02-262-19/+55
|\
| * couchdb create: don't call _all_dbs unless neededsdelano2014-02-252-19/+55
|/
* add Chef::Checksum to json_class hack (OC-6484)danielsdeleo2013-02-221-0/+3
* fix json_compat to raise same errors as json gemdanielsdeleo2013-02-121-1/+7
* add support for actual sandbox objectsdanielsdeleo2013-02-113-1/+111
* Merge branch 'apply-json-dos-fix-to-plmaster' into pl-masterdanielsdeleo2013-02-113-2/+101
|\
| * also apply fix for cookbook versiondanielsdeleo2013-02-111-1/+1
| * hand cherry-pick json-dos-fix to pl masterdanielsdeleo2013-02-112-1/+100
|/
* Merge pull request #470 from opscode/ma/dep-selector-fixesMark Anderson2012-11-056-2/+25
|\
| * Fix gem file to refer to tagged release of dep-selectorMark Anderson2012-11-051-1/+1
| * Add configurable timeout.Mark Anderson2012-11-052-1/+4
| * Add support for timeouts from dep_selectorMark Anderson2012-11-055-1/+21
|/
* CHEF-2899: Ensure proper roles/node json when activesupport is presentMark Mzyk2012-02-026-8/+66
* don't hide exceptions by raising another oneStephen Delano2011-09-211-1/+1
* remove knockout feature from deep_mergeDaniel DeLeo2011-09-012-662/+26
* don't create mashes for node dataDaniel DeLeo2011-08-181-4/+4
* avoid loading the entire chef/ohai app just for the modelsDaniel DeLeo2011-06-262-22/+1
* internal use code doesn't need to do validationsDaniel DeLeo2011-06-251-49/+0
* Merge branch 'ducktype-solrquery' into pl-masterDaniel DeLeo2011-06-241-1/+1
|\
| * allow CouchDB ducktypes for the couchdb objectDaniel DeLeo2011-06-241-1/+1
|/
* Merge branch 'master' into pl-mastersdelano2011-06-2193-708/+4412
|\
| * Merge branch 'CHEF-2416'Nuo Yan2011-06-131-26/+26
| |\
| | * Fix CHEF-2416 Data Bag Item edit error in WebUINuo Yan2011-06-131-26/+26
| |/
| * Merge branch 'CHEF-1907'Bryan McLellan2011-06-072-4/+35
| |\
| | * OSX macports package provider respects options attributeBruce Krysiak2011-06-072-4/+35
| |/
| * Merge branch 'CHEF-2378'Bryan McLellan2011-06-061-1/+2
| |\
| | * Use Chef::Expander::VERSION to get the gem versionDan Porter2011-05-251-1/+2
| * | Merge branch 'CHEF-2300'Bryan McLellan2011-06-032-3/+3
| |\ \
| | * | increase net-ssh-multi requirement to ~> 1.1.0, fixing CHEF-2300 and possibly...Lamont Granquist2011-06-032-3/+3
| |/ /
| * | Merge branch 'CHEF-2398'Bryan McLellan2011-06-032-3/+19
| |\ \
| | * | Fixed easy_install package provider to use supplied options.Jon Ramsey2011-06-032-3/+19
| |/ /
| * | Merge branch 'CHEF-2399'Bryan McLellan2011-06-033-1/+56
| |\ \
| | * | Fixed CHEF-2399 default group provider does not work on suse linuxJesai Langenbach2011-06-033-1/+56
| |/ /
| * | do not lie about what exit code we expectedBryan McLellan2011-06-031-1/+1
| * | CHEF-2250: Collect exitstatus via 0 after open3 blockBryan McLellan2011-06-031-2/+2
| * | Merge branch 'CHEF-2235'Nuo Yan2011-06-032-5/+5
| |\ \
| | * | CHEF-2235: Set timeout for freebsd port compile to 20 minsNuo Yan2011-06-032-5/+5
| * | | Merge branch 'CHEF-2316'Bryan McLellan2011-06-024-13/+125
| |\ \ \ | | |/ / | |/| |
| | * | CHEF-2316: add some spec tests for knife helpBryan McLellan2011-06-021-0/+92
| | * | CHEF-2316: Switch to a list based system for knife help rather than globBryan McLellan2011-06-023-13/+33
| * | | CHEF-1439: Resolve merge conflict.Nuo Yan2011-06-022-96/+164
| |\ \ \
| | * | | Problem #1 fixed alsoToomas Pelberg2010-10-202-16/+32
| | * | | Handle problem2 in http://tickets.opscode.com/browse/CHEF-1439, no need to re...Toomas Pelberg2010-10-202-94/+147
| * | | | Use local variablesNuo Yan2011-06-021-9/+9
| * | | | fixed tests for CHEF-2271Anthony Goddard2011-06-021-17/+5
| * | | | moved bulk deletion out of knife.rb, added client deletion into client_bulk_d...Anthony Goddard2011-06-022-32/+24
| * | | | bulk client delete list now consistent with node delete list (horizontal)Anthony Goddard2011-06-021-3/+5
| | |/ / | |/| |
| * | | Merge branch 'CHEF-2127'Bryan McLellan2011-06-019-1/+164
| |\ \ \
| | * | | Fixed CHEF-2127 chef-client daemon does not pick up changes from chef server.Dan Porter2011-06-019-1/+164
| |/ / /
| * | | Merge branch 'CHEF-2387'Bryan McLellan2011-06-013-0/+329
| |\ \ \