summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Revert "CHEF-4101: DeepMerge - support overwriting hash values with nil"sersut/revert-attr-nil-overrideSerdar Sutay2014-11-082-20/+3
* Merge pull request #2097 from opscode/lcg/chef-12-attrLamont Granquist2014-11-087-50/+546
|\
| * add md files for chef-12 attr syntaxLamont Granquist2014-11-082-0/+9
| * fix rspec truthy thingsLamont Granquist2014-11-081-6/+6
| * fix autovivificationLamont Granquist2014-11-083-33/+88
| * chef-12 attribute changesLamont Granquist2014-11-085-44/+476
|/
* Merge pull request #2370 from opscode/ryan/follow_symlinksSerdar Sutay2014-11-073-1/+25
|\
| * Fix rspec 3 specs.ryan/follow_symlinksSerdar Sutay2014-11-071-2/+2
| * Add spec for making client.pem a symlink a config optionRyan Cragun2014-11-071-0/+16
| * Make client.pem being a symlink a configurable optionRyan Cragun2014-11-072-1/+9
* | Add CLA_ARCHIVE -- List of CLAs from pre-supermarket timesdanielsdeleo2014-11-071-0/+2510
|/
* Merge pull request #2368 from opscode/sersut/knife-cloud-bootstrap-optionsSerdar Sutay2014-11-073-9/+36
|\
| * Rspec 3 compat.Serdar Sutay2014-11-071-3/+3
| * Make sure that :distro is evaluated later than :bootstrap_template and :templ...Serdar Sutay2014-11-073-9/+36
|/
* Merge pull request #2324 from opscode/mcquin/rspec-3Claire McQuin2014-11-07321-7488/+7505
|\
| * Don't populate X-Chef-Version.mcquin/rspec-3Claire McQuin2014-11-071-0/+7
| * Merge branch 'master' into mcquin/rspec-3Claire McQuin2014-11-0760-245/+702
| |\ | |/ |/|
* | Bring in cheffish and provisioning resources if they are installedchef-provisioningJohn Keiser2014-11-051-0/+7
* | Change the integration test server port from 8889 to 8890 so the test can suc...Chris Doherty2014-11-051-2/+2
* | Merge pull request #2273 from opscode/jdmundrawala/gemspecJay Mundrawala2014-11-042-4/+3
|\ \
| * | Only include chef-service-manager on windowsjdmundrawala/gemspecJay Mundrawala2014-10-212-4/+3
* | | update html pages for chef-client 12jamescott2014-11-0322-123/+348
* | | update man pages for chef-client 12jamescott2014-11-0334-116/+342
| | * Merge pull request #2346 from opscode/tball/rspec3-fixClaire McQuin2014-11-033-17/+18
| | |\
| | | * Updating from comments - simplifying codetball/rspec3-fixtyler-ball2014-11-032-16/+6
| | | * Removing bad check-intyler-ball2014-11-031-1/+0
| | | * Updating pedant to run correctly and send output to STDOUTtyler-ball2014-11-032-8/+24
| | | * Merge 83965110f4803416ffa535080b129f6546c746e4 into 2f942406d9bb64335586cbca9...Claire McQuin2014-10-31318-7486/+7481
| | | |\ | |_|/ / |/| | |
| | | * shell_out didn't pick up entire commandClaire McQuin2014-10-311-2/+4
| | | * Modify pedant to run w/o chefClaire McQuin2014-10-313-18/+12
| | | * Change pending to skipClaire McQuin2014-10-311-1/+1
| | * | Explicitly disable :should syntax in spec and mocksClaire McQuin2014-11-031-0/+8
| | * | Remove remaining should syntax.Claire McQuin2014-11-031-4/+4
| | * | Clean up for Windows spec deprecation warnings.Claire McQuin2014-11-032-3/+3
| | * | Fix stub for failing spec on 1.9.3Claire McQuin2014-11-031-0/+1
| | * | Update for RSpec 3.Claire McQuin2014-11-031-0/+1
| | * | Change pending to skip.Claire McQuin2014-11-031-1/+1
| | |/
| | * Merge branch 'master' into mcquin/rspec-3Claire McQuin2014-10-313-5/+4
| | |\ | |_|/ |/| |
* | | Merge pull request #2326 from opscode/tball/travisBryan McLellan2014-10-311-0/+1
|\ \ \
| * | | Updating travis to run builds on 12-stabletball/travistyler-ball2014-10-301-0/+1
* | | | Merge pull request #2328 from opscode/sersut/win-spec-fixSerdar Sutay2014-10-301-2/+2
|\ \ \ \
| * | | | Fix windows specs for windows package type.Serdar Sutay2014-10-301-2/+2
|/ / / /
* | | | Merge pull request #2322 from opscode/tball/doc-fixTyler Ball2014-10-301-3/+1
|\ \ \ \
| * | | | Fixing documentation errortball/doc-fixtyler-ball2014-10-291-3/+1
| |/ / /
| | | * Merge branch 'mcquin/rspec-3' of github.com:opscode/chef into mcquin/rspec-3Claire McQuin2014-10-304-16/+18
| | | |\
| | | | * Fix some Windows specs.Claire McQuin2014-10-304-16/+18
| | | * | Get pedant changes for rspec 3Claire McQuin2014-10-301-1/+1
| | | |/
| | | * Merge branch 'master' into mcquin/rspec-3Claire McQuin2014-10-3011-57/+69
| | | |\ | |_|_|/ |/| | |
* | | | Merge pull request #2313 from opscode/sersut/win-res-lookup-fixSerdar Sutay2014-10-3011-58/+70
|\ \ \ \ | |/ / / |/| | |
| * | | Fix the after blocks in reboot_pending specs.sersut/win-res-lookup-fixSerdar Sutay2014-10-291-4/+4
View Lorry Controller Status