summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Add as Windows maintainerjdm/maintainerJay Mundrawala2015-01-231-0/+1
* Add as core maintainerJay Mundrawala2015-01-231-0/+1
* Add CHANGELOG entry for #2684Jay Mundrawala2015-01-221-0/+1
* Merge pull request #2684 from chef/jdm/win-seg-faultJay Mundrawala2015-01-222-7/+0
|\
| * Removing ole_initialize/uninitializejdm/win-seg-faultJay Mundrawala2014-12-182-7/+0
* | Merge pull request #2787 from chef/mh/travis_badgeLamont Granquist2015-01-221-1/+1
|\ \
| * | Fix travis badge after org renamemh/travis_badgeMark Harrison2015-01-221-1/+1
|/ /
* | Merge pull request #2785 from opscode/mm/filing-issues-readmeLamont Granquist2015-01-222-0/+16
|\ \
| * | Clarify where issues should be filedmmzyk2015-01-222-0/+16
|/ /
* | Merge pull request #2605 from jtimberman/jtimberman/knife-ssl-check-server-lo...Joshua Timberman2015-01-211-2/+2
|\ \
| * | Fixes #2604, update location for Chef Server 12jtimberman2015-01-211-2/+2
|/ /
* | Merge pull request #2751 from opscode/lcg/default-cookbookLamont Granquist2015-01-206-11/+48
|\ \
| * | add md file for include_recipe '::foo'Lamont Granquist2015-01-201-0/+1
| * | make include_recipe "::foo" use current cookbookLamont Granquist2015-01-205-11/+47
|/ /
* | Merge pull request #2762 from jaymzh/sslwarnPhil Dibowitz2015-01-204-33/+10
|\ \
| * | Drop the SSL warning now that we have a safe defaultPhil Dibowitz2015-01-166-46/+7
| * | Fix unittestPhil Dibowitz2015-01-151-1/+1
| * | Suppress SSL warnings if I know what I'm doingPhil Dibowitz2015-01-156-1/+17
|/ /
* | Merge pull request #2753 from opscode/lcg/deep-merge-cache-fixLamont Granquist2015-01-143-4/+36
|\ \
| * | add md fileLamont Granquist2015-01-141-0/+1
| * | deep_merge_cache fixes for bugs in 12.0.0Lamont Granquist2015-01-142-4/+35
* | | Merge pull request #2734 from smurawski/patch-1Adam Jacob2015-01-141-0/+1
|\ \ \
| * | | Add Steven Murawski (smurawski) as Windows MaintainerSteven Murawski2015-01-081-0/+1
* | | | Merge pull request #2723 from patcox/CHEF-2667Phil Dibowitz2015-01-142-7/+17
|\ \ \ \
| * | | | fix small readability issue, as per code reviewPat Cox2015-01-121-1/+3
| * | | | bugfix dscl providerPat Cox2015-01-122-7/+15
* | | | | Merge pull request #2724 from patcox/dscl_fix_salt_bugPhil Dibowitz2015-01-142-0/+13
|\ \ \ \ \
| * | | | | add code comment, add unit test for case when no salt is foundPat Cox2015-01-122-0/+12
| * | | | | OS X user provider - fix exception if no salt is foundPat Cox2015-01-121-0/+1
* | | | | | Merge pull request #2722 from patcox/CHEF-2690Phil Dibowitz2015-01-133-0/+3
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | Macports provider - provide packagePat Cox2015-01-123-0/+3
* | | | | | Merge pull request #2749 from opscode/jdm/metadata-error-infoJay Mundrawala2015-01-133-4/+12
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Update spec to check that information about why the cookbook was not found is...Jay Mundrawala2015-01-131-1/+5
| * | | | | Provide more info when cookbook metadata is not foundJay Mundrawala2015-01-132-3/+7
|/ / / / /
* | | | | Merge pull request #2624 from opscode/lcg/suppress-3694Lamont Granquist2015-01-127-50/+232
|\ \ \ \ \
| * | | | | add md fileLamont Granquist2015-01-121-0/+1
| * | | | | Skip 3694 warnings on trivial resource cloningLamont Granquist2015-01-126-50/+231
|/ / / / /
* | | | | Merge pull request #2730 from opscode/lcg/chef-gem-compile-time-flagLamont Granquist2015-01-123-6/+78
|\ \ \ \ \
| * | | | | add md fileLamont Granquist2015-01-121-0/+1
| * | | | | add a compile_time flag to chef_gem resourceLamont Granquist2015-01-122-6/+77
|/ / / / /
* | | | | Merge pull request #2727 from opscode/lcg/force-languageLamont Granquist2015-01-123-22/+58
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | add md fileLamont Granquist2015-01-121-0/+1
| * | | | fix some of the spec titlesLamont Granquist2015-01-121-10/+10
| * | | | add forcing of LANG and LANGUAGE env varsLamont Granquist2015-01-122-12/+47
|/ / / /
* | | | Merge pull request #2686 from opscode/jdm/disable-execute-timeout-winJay Mundrawala2015-01-121-3/+6
|\ \ \ \ | |/ / / |/| | |
| * | | Execute spec should actually check to make sure it did not wait for 600 secondsjdm/disable-execute-timeout-winJay Mundrawala2014-12-181-3/+6
* | | | Merge pull request #2729 from opscode/lcg/add-ruby-22Lamont Granquist2015-01-121-0/+1
|\ \ \ \
| * | | | add ruby 2.2.0 to travislcg/add-ruby-22Lamont Granquist2015-01-071-0/+1
* | | | | Merge pull request #2721 from patcox/CHEF-2691Phil Dibowitz2015-01-093-9/+9
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | update provider mapping test - macports uses new mapping codePat Cox2015-01-081-7/+7