summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #2436 from opscode/tball/audit-duplication-testmcquin/controls_group_objectClaire McQuin2014-11-2110-1/+146
|\
| * Fixing failing tests after claire's refactor - controls block not evaluated u...tyler-ball2014-11-212-1/+13
| * Merge remote-tracking branch 'origin/mcquin/controls_group_object' into tball...tyler-ball2014-11-211-14/+84
| |\ | |/ |/|
* | Add comments, logically reorder codeClaire McQuin2014-11-211-14/+84
| * this spec file should have the correct name typetyler-ball2014-11-211-0/+0
| * cleaning up bad rebase mergetyler-ball2014-11-211-4/+8
| * Oops - this was causing output to be an array instead of a stringtyler-ball2014-11-211-1/+1
| * Updating duplication tests to levage a cookbook, so we can use the same cookb...tyler-ball2014-11-218-60/+71
| * Removing required that was not usedtyler-ball2014-11-211-1/+0
| * Fixing a test that was written wrongtyler-ball2014-11-211-8/+15
| * Finishing duplication teststyler-ball2014-11-213-20/+82
| * Adding test for duplicated DSLtyler-ball2014-11-212-1/+51
|/
* Add omitted config options.Claire McQuin2014-11-211-8/+17
* Raise error if duplicate controls block given.Claire McQuin2014-11-211-2/+9
* Remove audit_test cookbook, covered in another branch.Claire McQuin2014-11-219-185/+0
* Merge branch 'mcquin/controls_group_object' of github.com:opscode/chef into m...Claire McQuin2014-11-214-2/+34
|\
| * Merge pull request #2468 from opscode/mcquin/include-recipe-testClaire McQuin2014-11-214-2/+34
| |\
| | * Add recipes to test include_recipe, multiple controls blocksClaire McQuin2014-11-213-10/+23
| | * Fix typoClaire McQuin2014-11-211-1/+1
| | * Merge branch 'mcquin/controls_group_object' of github.com:opscode/chef into m...Claire McQuin2014-11-216-148/+65
| | |\ | | |/ | |/|
| | * Wrap in control block until we get top-level tests working.Claire McQuin2014-11-202-6/+10
| | * Merge branch 'mcquin/controls_group_object' of github.com:opscode/chef into m...Claire McQuin2014-11-206-96/+143
| | |\
| | * | 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 branch 'audit-mode' of github.com:opscode/chef into mcquin/controls_gro...Claire McQuin2014-11-212-8/+31
|\ \ \ \ | |/ / / |/| | |
| * | | Merge pull request #2461 from opscode/tball/start-end-timeTyler Ball2014-11-212-5/+29
| |\ \ \
| | * | | Requring time - needed for iso8601 formattyler-ball2014-11-211-2/+7
| | * | | Adding start_time and end_time to array per requesttball/start-end-timetyler-ball2014-11-202-5/+24
| |/ / /
| * | | Merge pull request #2453 from opscode/sersut/audit-integSerdar Sutay2014-11-201-3/+2
| |\ \ \ | | |/ / | |/| |
| | * | Remove compression since the server doesn't support it yet.sersut/audit-integSerdar Sutay2014-11-191-3/+2
| |/ /
* | | Use a central runnerClaire McQuin2014-11-216-148/+65
| |/ |/|
* | Merge branch 'audit-mode' of github.com:opscode/chef into mcquin/controls_gro...Claire McQuin2014-11-2015-37/+306
|\ \ | |/
| * 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
| |/
* | Add comments.Claire McQuin2014-11-141-0/+51
* | Add audit mode stub.Claire McQuin2014-11-141-0/+9
* | Add a Chef::Audit::Controls object for 'controls'Claire McQuin2014-11-145-93/+83
|/
* 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
| | |/