summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of https://github.com/chef/chefAbhishekKr2016-10-0695-845/+2117
|\
| * Merge pull request #5417 from chef/lcg/issue5089Thom May2016-10-062-8/+22
| |\ | | | | | | Fix for "Chefspec template rendering fails when cookbook_name != directory name"
| | * redo of the redo of the patch to fix #5089lcg/issue5089Lamont Granquist2016-10-051-8/+7
| | | | | | | | | | | | | | | | | | | | | | | | see discussion in: https://github.com/chef/chef/pull/5096 Signed-off-by: Lamont Granquist <lamont@scriptkiddie.org>
| | * add a spec for the fix to #5089Lamont Granquist2016-10-051-0/+15
| | | | | | | | | | | | Signed-off-by: Lamont Granquist <lamont@scriptkiddie.org>
| * | Bump version of chef to 12.15.14 by Chef Versioner.v12.15.14Chef Versioner2016-10-064-8/+8
| | |
| * | Merge pull request #5406 from chef/shain/test_bumpMatt Wrock2016-10-061-1/+1
| |\ \ | | | | | | | | Update omnibus pinning to pull in Solaris 11 pkg fix
| | * | Update omnibus pinningshain/test_bumpScott Hain2016-10-041-1/+1
| | |/ | | | | | | | | | Signed-off-by: Scott Hain <shain@chef.io>
| * | Bump version of chef to 12.15.13 by Chef Versioner.v12.15.13Chef Versioner2016-10-064-8/+8
| | |
| * | Merge pull request #5420 from chef/revert-5381-nim/double_quotes_parsing_errorMatt Wrock2016-10-053-24/+39
| |\ \ | | | | | | | | Revert "Handling double quotes in powershell_out"
| | * | Revert Handling double quotes in powershell_outMatt Wrock2016-10-053-24/+39
| | | | | | | | | | | | | | | | Signed-off-by: Matt Wrock <matt@mattwrock.com>
| * | | Merge pull request #5407 from chef/chef_clientMatt Wrock2016-10-052-1/+4
| |\ \ \ | | |/ / | |/| | Fix centos 6 kitchen tests with chef-client cookbook 6.0.0
| | * | Fix centos 6 kitchen tests with chef-client 6chef_clientMatt Wrock2016-10-042-1/+4
| | |/ | | | | | | | | | Signed-off-by: Matt Wrock <matt@mattwrock.com>
| * | Merge pull request #5408 from coderanger/solaris-mNoah Kantrowitz2016-10-062-3/+13
| |\ \ | | | | | | | | Fix solaris handling for useradd -m/-M behavior
| | * | Fix solaris handling for -m/-M behavior. Fixes #5403.Noah Kantrowitz2016-10-052-3/+13
| | | | | | | | | | | | | | | | Signed-off-by: Noah Kantrowitz <noah@coderanger.net>
| * | | Bump version of chef to 12.15.12 by Chef Versioner.v12.15.12Chef Versioner2016-10-054-8/+8
| | | |
| * | | Merge pull request #5414 from chef/testMatt Wrock2016-10-051-1/+1
| |\ \ \ | | | | | | | | | | turn off fips unit-functional tests on windows acceptance
| | * | | turn off fips unit-functional tests on windows acceptanceMatt Wrock2016-10-051-1/+1
| |/ / / | | | | | | | | | | | | Signed-off-by: Matt Wrock <matt@mattwrock.com>
| * | | Merge pull request #5381 from ↵Bryan McLellan2016-10-053-39/+24
| |\ \ \ | | |_|/ | |/| | | | | | | | | | MsysTechnologiesllc/nim/double_quotes_parsing_error Handling double quotes in powershell_out
| | * | Raising Mixlib::ShellOut::ShellCommandFailed exceptionNimishaS2016-10-033-4/+4
| | | | | | | | | | | | | | | | Signed-off-by: NimishaS <nimisha.sharad@msystechnologies.com>
| | * | Removed unwanted templatesNimishaS2016-09-303-3/+0
| | | | | | | | | | | | | | | | Signed-off-by: NimishaS <nimisha.sharad@msystechnologies.com>
| | * | Handling double quotes. Added specsNimishaS2016-09-306-39/+27
| | | | | | | | | | | | | | | | Signed-off-by: NimishaS <nimisha.sharad@msystechnologies.com>
| * | | Merge pull request #5319 from tas50/apt_update_specsThom May2016-10-041-17/+25
| |\ \ \ | | | | | | | | | | Test apt_update on non-linux behavior
| | * | | Test apt_update on non-linux behaviorTim Smith2016-09-141-17/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make sure on non-linux without running which we still end up with a no-op Signed-off-by: Tim Smith <tsmith@chef.io>
| * | | | Merge pull request #5290 from bai/better-apt-key-cacheThom May2016-10-041-1/+1
| |\ \ \ \ | | | | | | | | | | | | Normalize full key name to avoid resource update on identical key names
| | * | | | Normalize full key name to avoid resource update on identical key namesVlad Gorodetsky2016-09-191-1/+1
| | | | | |
| * | | | | Bump version of chef to 12.15.11 by Chef Versioner.v12.15.11Chef Versioner2016-10-044-8/+8
| | | | | |
| * | | | | Merge pull request #5245 from chef/jk/knife-cookbook-delete-testThom May2016-10-041-59/+48
| |\ \ \ \ \ | | | | | | | | | | | | | | Don't let knife cookbook delete tests print to stdout
| | * | | | | Don't let knife cookbook delete tests print to stdoutjk/knife-cookbook-delete-testJohn Keiser2016-09-081-59/+48
| | | | | | |
| * | | | | | Merge pull request #5314 from chef/tm/raw_keyThom May2016-10-042-1/+51
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | Allow raw_key to override the configured signing_key
| | * | | | | | Allow raw_key to override the configured signing_keytm/raw_keyThom May2016-09-142-1/+51
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes: #5175 Signed-off-by: Thom May <thom@may.lt>
| * | | | | | | Merge pull request #5382 from pwalz/fix-15update-stampThom May2016-10-041-1/+1
| |\ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | | Add trailing newline to generated 15update-stamp
| | * | | | | | Add trailing newline to generated 15update-stamp (obvious fix)Peter Walz2016-09-231-1/+1
| | | | | | | |
| * | | | | | | Merge pull request #5405 from chef/depsLamont Granquist2016-10-036-41/+40
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | update dependencies
| | * | | | | | | update dependenciesMatt Wrock2016-10-036-41/+40
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Matt Wrock <matt@mattwrock.com>
| * | | | | | | Bump version of chef to 12.15.10 by Chef Versioner.v12.15.10Chef Versioner2016-10-034-8/+8
| | | | | | | |
| * | | | | | | Merge pull request #5404 from chef/omniMatt Wrock2016-10-031-10/+10
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | update omnibus branch sha to get new autoloading commit
| | * | | | | | | update omnibus branch sha to get new autoloading commitMatt Wrock2016-10-031-10/+10
| | | | | | | | |
| * | | | | | | | Bump version of chef to 12.15.9 by Chef Versioner.v12.15.9Chef Versioner2016-10-034-8/+8
| | | | | | | | |
| * | | | | | | | Merge pull request #5400 from chef/dcoTim Smith2016-10-032-24/+65
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Update contributing docs for the DCO
| | * | | | | | | | Updates to the DCO wording based on feedbackdcoTim Smith2016-10-031-25/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Tim Smith <tsmith@chef.io>
| | * | | | | | | | Update contributing doc for the DCOTim Smith2016-10-021-15/+71
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Tim Smith <tsmith@chef.io>
| | * | | | | | | | Update links in the readmeTim Smith2016-09-301-7/+9
| | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Tim Smith <tsmith@chef.io>
| * | | | | | | | Bump version of chef to 12.15.8 by Chef Versioner.v12.15.8Chef Versioner2016-09-304-8/+8
| | | | | | | | |
| * | | | | | | | Merge pull request #5398 from shortdudey123/fix_yum_repository_gpgcheckTim Smith2016-09-301-1/+1
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | Set yum_repository gpgcheck default to true
| | * | | | | | | Set yum_repository gpgcheck default to trueGrant Ridder2016-09-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes https://github.com/chef/chef/issues/5397
| * | | | | | | | Bump version of chef to 12.15.7 by Chef Versioner.v12.15.7Chef Versioner2016-09-304-8/+8
| | | | | | | | |
| * | | | | | | | Merge pull request #5380 from brit-smith/contributingLamont Granquist2016-09-301-20/+20
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Updates to the Contributing process document
| | * | | | | | | | Updates to the Contributing process documentBrittany Smith2016-09-251-20/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Paired with @tas50 to update the contributing process document for clarity.
| * | | | | | | | | Bump version of chef to 12.15.6 by Chef Versioner.v12.15.6Chef Versioner2016-09-304-8/+8
| | | | | | | | | |
| * | | | | | | | | Merge pull request #5359 from ↵Bryan McLellan2016-09-307-19/+265
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MsysTechnologiesllc/ali/windows_registry_key_resource_delete_fix Allow deletion of registry_key without the need for users to pass data key in values hash.