summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Add recipe to test include_recipe with controls.mcquin/include-recipe-testClaire McQuin2014-11-191-0/+15
* Add Chef::Exceptions to audit errorClaire McQuin2014-11-191-1/+1
* Merge pull request #2428 from opscode/sersut/basic-audit-testSerdar Sutay2014-11-1715-36/+308
|\
| * Move the dev-repo cookbooks to kitchen-tests directory based on PR comments.Serdar Sutay2014-11-1712-33/+7
| * Updates based on PR comments.Serdar Sutay2014-11-172-3/+2
| * Make sure we don't close the output_stream after running rspec.sersut/basic-audit-testSerdar Sutay2014-11-147-35/+76
| * Basic test for audit mode.Serdar Sutay2014-11-1412-0/+258
|/
* Merge branch 'audit-mode' into tball/audit-teststball/audit-teststyler-ball2014-11-1399-619/+4416
|\
| * Merge pull request #2415 from opscode/audit-mode-rebaseClaire McQuin2014-11-1399-619/+4416
| |\
| | * Merge branch 'audit-mode' into audit-mode-rebaseaudit-mode-rebaseClaire McQuin2014-11-130-0/+0
| | |\ | | |/ | |/|
| | * Adding audit mode JSON formattertyler-ball2014-11-1315-25/+740
| | * Merge pull request #2407 from opscode/sersut/ci-fix-sparcSerdar Sutay2014-11-121-1/+7
| | |\
| | | * Fix unit specs on Sparc.Serdar Sutay2014-11-121-1/+7
| | |/
| | * Merge pull request #2395 from opscode/jdmundrawala/chef-shell-windowsJay Mundrawala2014-11-111-2/+10
| | |\
| | | * chef-shell checks platform when looking for client.rb and solo.rb.jdmundrawala/chef-shell-windowsJay Mundrawala2014-11-101-2/+10
| | * | Merge pull request #2394 from opscode/jdmundrawala/win-cookbook-ns-colJay Mundrawala2014-11-101-6/+5
| | |\ \ | | | |/ | | |/|
| | | * Windows event logger no longer imports into the global namespace.Jay Mundrawala2014-11-101-6/+5
| | |/
| | * Merge pull request #2336 from opscode/lcg/12-systemd-fixesjdm/fooSerdar Sutay2014-11-0822-286/+566
| | |\
| | | * Update md files.Serdar Sutay2014-11-081-1/+7
| | | * rspec 3 fixeslcg/12-systemd-fixesLamont Granquist2014-11-081-4/+4
| | | * spec fixesLamont Granquist2014-11-083-6/+36
| | | * syntax fixes for grepping outputLamont Granquist2014-11-081-2/+6
| | | * polishing provider_resolverLamont Granquist2014-11-0816-72/+216
| | | * add some more debug output and commentsLamont Granquist2014-11-081-2/+7
| | | * systemctl path fixes, rspec modernization, etcLamont Granquist2014-11-082-188/+225
| | | * extract which to a mixin, use for systemctlLamont Granquist2014-11-083-13/+51
| | | * correct list-unit-files + refactoringLamont Granquist2014-11-081-3/+6
| | | * fix systemd for Ubuntu 14.10Lamont Granquist2014-11-081-3/+16
| | * | Merge pull request #2387 from opscode/sersut/revert-attr-nil-overrideSerdar Sutay2014-11-082-20/+3
| | |\ \
| | | * | 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