summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #1251 from opscode/adamed/oc-11191-spec-workaround11.10.0.rc.1Adam Edwards2014-02-051-0/+6
* Merge branch 'master' into 11-stabledanielsdeleo2014-02-041-3/+0
|\
| * Remove `rake gem` dep on deleted tasksdanielsdeleo2014-02-041-3/+0
* | Merge branch 'master' into 11-stabledanielsdeleo2014-02-041-1/+1
|\ \ | |/
| * Bump version number for 11.10.0.rc.2 releasedanielsdeleo2014-02-041-1/+1
* | Merge branch 'master' into 11-stabledanielsdeleo2014-02-043-74/+0
|\ \ | |/
| * Remove obsolete doc generator depsdanielsdeleo2014-02-043-74/+0
* | Merge branch 'master' into 11-stabledanielsdeleo2014-02-04125-4945/+12846
|\ \ | |/
| * add updated html files for knife and chef- man pagesjamescott2014-02-0467-4829/+1977
| * remove old crufty man pagesjamescott2014-02-0424-4943/+0
| * Merge pull request #1240 from opscode/praj/resource_name_and_id_to_strPrajaktaPurohit2014-02-042-2/+57
| |\
| | * Adding tests to make sure the resource_name and resource_id are of typePrajakta Purohit2014-02-041-0/+55
| | * Making sure that the resource_name and resource_id while being sent to report...Prajakta Purohit2014-01-311-2/+2
| * | add HTML file for manpage output testingjamescott2014-02-0487-0/+15534
| * | add knife compare to man pagejamescott2014-02-041-0/+107
* | | Reset version changes to avoid conflicts with subsequent mergesdanielsdeleo2014-02-0426-135/+98
* | | Merge branch 'master' into 11-stabledanielsdeleo2014-02-04244-2303/+2527
|\ \ \ | |/ /
| * | Better specify what happens for NoMethodErrors in the DSLdanielsdeleo2014-02-034-3/+55
| * | Expose resource creation via more static methodsdanielsdeleo2014-02-033-39/+147
| * | Merge branch 'CHEF-3506'danielsdeleo2014-02-036-7/+36
| |\ \
| | * | [CHEF-3506] suppress final node save when using override run listdanielsdeleo2014-02-036-7/+36
| |/ /
| * | Update file providers to close before unlinking.danielsdeleo2014-02-032-0/+2
| * | Close before unlink because windowsdanielsdeleo2014-02-031-8/+11
| * | update with note re: versionjamescott2014-02-032-0/+6
| * | Delegate sync_cookbooks to policy_builder, subclasses rely on itdanielsdeleo2014-02-034-5/+13
| * | Merge pull request #1246 from opscode/CHEF-4747-fixSerdar Sutay2014-02-031-1/+1
| |\ \
| | * | Make sure --concurrency 1 works while uploading multiple cookbooks.sersut2014-02-031-1/+1
| |/ /
| * | Use custom tempfile to avoid ruby 1.8-related test failuresdanielsdeleo2014-02-031-1/+26
| |/
| * update man pages w/11-10 versionjamescott2014-01-3130-30/+30
| * update man pagesjamescott2014-01-3123-202/+81
| * Merge pull request #1238 from opscode/lcg/rspec-2.14-deprecation-warningslamont-granquist2014-01-30233-2254/+2261
| |\
| | * omit test on ruby-1.8Lamont Granquist2014-01-301-1/+1
| | * ripping out rspec_reset entirelyLamont Granquist2014-01-295-16/+0
| | * fix busted spec exposed by rpsec-2.14-izationLamont Granquist2014-01-291-1/+1
| | * remove some more deprecation warningsLamont Granquist2014-01-296-9/+9
| | * fix broken specs revealed by rspec-2.14-izationLamont Granquist2014-01-291-11/+9
| | * need action for define_resource_requirementsLamont Granquist2014-01-293-0/+3
| | * fix test, define_resource_requirements needs an actionLamont Granquist2014-01-291-0/+1
| | * fix broken file provider specsLamont Granquist2014-01-291-0/+10
| | * fix should_not raise_error(SpecificException)Lamont Granquist2014-01-2945-216/+216
| | * this test should have been failingLamont Granquist2014-01-291-8/+8
| | * the perils of regexp-based code editingLamont Granquist2014-01-291-1/+1
| | * s/mock\(/double(/gLamont Granquist2014-01-29114-363/+363
| | * s/stub!/stub/gLamont Granquist2014-01-29193-1625/+1625
| | * fix obvious derpLamont Granquist2014-01-291-1/+1
| | * fix rspec_reset problemLamont Granquist2014-01-295-4/+15
| | * fix "please stub a default message first"Lamont Granquist2014-01-291-17/+17
| | * bump to rspec 2.14.xLamont Granquist2014-01-291-1/+1
| * | Remove crufty require of pryBryan McLellan2014-01-301-2/+0
| |/
* | update with note re: versionjamescott2014-02-032-0/+6
View Lorry Controller Status