summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Update to use :let syntax.mcquin/merge-masterClaire McQuin2014-12-161-1/+1
* Merge branch 'master' into audit-modeClaire McQuin2014-12-1657-822/+1505
|\
| * Contribution info for https://github.com/opscode/chef/pull/2658.Serdar Sutay2014-12-161-8/+11
| * Merge pull request #2640 from opscode/lcg/apt-provider-release-optionLamont Granquist2014-12-154-265/+270
| |\
| | * add CHANGELOGLamont Granquist2014-12-151-1/+1
| | * fix apt default_release attribute broken in 12.0Lamont Granquist2014-12-153-264/+269
| |/
| * Merge pull request #2650 from opscode/sersut/contrib-jsonSerdar Sutay2014-12-151-0/+2
| |\
| | * Contribution information for https://github.com/opscode/chef/pull/2642.Serdar Sutay2014-12-151-0/+2
| |/
| * Merge pull request #2642 from opscode/btm/site_install_jsonSerdar Sutay2014-12-153-124/+194
| |\
| | * Add unit tests for cookbook site install #preferred_metadatabtm/site_install_jsonBryan McLellan2014-12-151-0/+41
| | * Clean up knife cookbook site install testsBryan McLellan2014-12-152-97/+99
| | * Use a real error class when metadata is not foundSeth Vargo2014-12-152-1/+6
| | * Allow knife to install cookbooks with metadata.jsonSeth Vargo2014-12-151-9/+31
| * | Added contributor for Issue 2625Jay Mundrawala2014-12-151-1/+2
| * | Merge pull request #2645 from opscode/sersut/contrib-2634Serdar Sutay2014-12-151-0/+5
| |\ \
| | * | Contribution information for https://github.com/opscode/chef/pull/2634.Serdar Sutay2014-12-151-0/+5
| |/ /
| * | Merge pull request #2634 from BackSlasher/repair-subversion-commandSerdar Sutay2014-12-152-8/+8
| |\ \
| | * | Subversion failes with "option ':command' is not a valid option for Mixlib::S...Nitz2014-12-142-8/+8
| * | | Update CHANGELOG for #2630danielsdeleo2014-12-151-0/+1
| | |/ | |/|
| * | Added changelog for issue 2625Jay Mundrawala2014-12-151-0/+1
| * | Merge branch 'knife-ssl-error-messaging'danielsdeleo2014-12-152-64/+101
| |\ \
| | * | Add specific error messaging for SSL errors to knifedanielsdeleo2014-12-152-0/+22
| | * | Convert knife specs to let bindingsdanielsdeleo2014-12-151-64/+79
| |/ /
| * | Merge pull request #2637 from opscode/jdm/issue-2626-rebaseJay Mundrawala2014-12-152-3/+20
| |\ \
| | * | Changed spec descriptionJay Mundrawala2014-12-151-2/+2
| | * | Bug #2625: Include ShellOut mixin in msi package providerjdm/issue-2626-rebaseSimon Detheridge2014-12-151-0/+2
| | * | Add specs for windows msi_specjdm/win-package-specsJay Mundrawala2014-12-141-2/+12
| | * | Windows msi package privoder unit tests run on all on all systemsJay Mundrawala2014-12-141-1/+6
| * | | Merge pull request #2623 from opscode/sersut/revert-1901Serdar Sutay2014-12-155-25/+40
| |\ \ \ | | |/ / | |/| |
| | * | CHANGELOG information for https://github.com/opscode/chef/issues/2580.Serdar Sutay2014-12-151-0/+1
| | * | As https://github.com/opscode/chef/issues/2580 summarizes, Link resource need...sersut/revert-1901Serdar Sutay2014-12-112-7/+17
| | * | Revert "Merge pull request #1901 from opscode/dont-prepend-to-relative-paths"Serdar Sutay2014-12-114-23/+27
| | |/
| * | Merge pull request #2629 from opscode/jdm/shellout-specJay Mundrawala2014-12-142-42/+44
| |\ \
| | * | Renamed dummy_obj to shell_out_objjdm/shellout-specJay Mundrawala2014-12-141-39/+39
| | * | Use extend instead of opening class and includingJay Mundrawala2014-12-141-3/+1
| | * | Cleanup Mixin:ShellOut use/specsJay Mundrawala2014-12-142-42/+46
| |/ /
| * | Merge pull request #2631 from opscode/jdm/kitchen-testsJay Mundrawala2014-12-141-1/+1
| |\ \ | | |/ | |/|
| | * Lock version of database cookbookjdm/kitchen-testsJay Mundrawala2014-12-131-1/+1
| |/
| * Merge pull request #2616 from jaymzh/whitelistSerdar Sutay2014-12-102-1/+37
| |\
| | * Add specPhil Dibowitz2014-12-101-0/+34
| | * Fix attribute whitelistingPhil Dibowitz2014-12-101-1/+3
| |/
| * Catch 'unknown protocol' errors in ssl fetch and explain themdanielsdeleo2014-12-102-10/+56
| * Fix #2596: parse instead of from_jsonjk/2596John Keiser2014-12-102-1/+2
| * Merge pull request #2610 from opscode/sersut/circular-dep-fixSerdar Sutay2014-12-102-7/+18
| |\
| | * Update changelog based on 12.0.1 and include CHANGELOG info for https://githu...Serdar Sutay2014-12-101-6/+14
| | * Resolve the circular dependency between ProviderResolver and Resource.Serdar Sutay2014-12-101-1/+4
| |/
| * Merge pull request #2594 from jaymzh/digesterPhil Dibowitz2014-12-091-0/+1
| |\
| | * Fix Digester to require its dependenciesPhil Dibowitz2014-12-091-0/+1
| |/
| * Merge pull request #2582 from jtimberman/jtimberman/brew-info-installedJoshua Timberman2014-12-093-1/+36
| |\
| | * add CHANGELOG.md entry for homebrew provider fixjtimberman2014-12-091-0/+1