summaryrefslogtreecommitdiff
Commit message (Collapse)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
| | | | | | | | | | Conflicts: CHANGELOG.md
| * Merge pull request #2640 from opscode/lcg/apt-provider-release-optionLamont Granquist2014-12-154-265/+270
| |\ | | | | | | fix apt default_release attribute broken in 12.0
| | * add CHANGELOGLamont Granquist2014-12-151-1/+1
| | |
| | * fix apt default_release attribute broken in 12.0Lamont Granquist2014-12-153-264/+269
| |/ | | | | | | | | | | | | | | | | | | | | | | | | the apt provider attempts to check if it has a provider that responds to :default_release (i.e. a real apt_package resource) via if the provider attribute is explicitly set or not, which is relying on a side-effect which broke in 12.0. the correct behavior is just to duck-type the new_resource object and see if it respond_to?(:default_release) and then use it if it does. Also the unit tests were not testing the apt_provider against both the package and apt_package resources. Added some hacky spec code (which needs a cleanup) to at least exercise the use cases.
| * Merge pull request #2650 from opscode/sersut/contrib-jsonSerdar Sutay2014-12-151-0/+2
| |\ | | | | | | Contribution information for https://github.com/opscode/chef/pull/2642.
| | * 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
| |\ | | | | | | knife cookbook site install json support w/tests
| | * 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | Previously `knife cookbook site install` would only install cookbooks that have a metadata.rb. This has a number of problems, mainly that compiled metadata is supported elsewhere in Chef. This commit adds support for parsing the metadata.json, even though the metadata.rb is still preferred (since that's what the rest of Chef does).
| * | 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.
| | * | 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::ShellOut"
| | * | Subversion failes with "option ':command' is not a valid option for ↵Nitz2014-12-142-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Mixlib::ShellOut" Improper use of `shell_out!`, which uses Mixlib Fixed #2633
| * | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Knife now gives an error message like this when an SSL error occurs: ``` ERROR: Could not establish a secure connection to the server. Use `knife ssl check` to troubleshoot your SSL configuration. If your Chef Server uses a self-signed certificate, you can use `knife ssl fetch` to make knife trust the server's certificates. Original Exception: OpenSSL::SSL::SSLError: SSL_connect returned=1 errno=0 state=SSLv3 read server certificate B: certificate verify failed ```
| | * | 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
| |\ \ | | | | | | | | Jdm/issue 2626 rebase
| | * | 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
| |\ \ \ | | |/ / | |/| | Preserve relative paths in Link resource
| | * | 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 ↵sersut/revert-1901Serdar Sutay2014-12-112-7/+17
| | | | | | | | | | | | | | | | | | | | | | | | need to support relative paths in its 'to' attribute since one can create a symlink pointing to a relative location. This is useful if the directory that symlink resides in moves to a different place (e.g. mounting a disk on a separate location). This commit preserves relative paths inside the "encode_path" method used by the link operations and expands relative paths in similar fashion when being used by file operations.
| | * | Revert "Merge pull request #1901 from opscode/dont-prepend-to-relative-paths"Serdar Sutay2014-12-114-23/+27
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 1241ea6f9866d0e61d11129bb32e5fc96cd2bac0, reversing changes made to 34d956c6b96087e6ca4bfbc9080037ded481709d. Conflicts: spec/functional/resource/file_spec.rb spec/functional/resource/link_spec.rb spec/unit/provider/link_spec.rb
| * | Merge pull request #2629 from opscode/jdm/shellout-specJay Mundrawala2014-12-142-42/+44
| |\ \ | | | | | | | | Cleanup Mixin:ShellOut use/specs
| | * | 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
| |\ \ | | |/ | |/| Constrain version of database cookbook
| | * Lock version of database cookbookjdm/kitchen-testsJay Mundrawala2014-12-131-1/+1
| |/ | | | | | | | | | | | | | | | | | | | | A release of mysql-chef_gem broke the database cookbook because it removed the default recipe which the database cookbook was using. Since the database cookbook did not lock versions of mysql-chef_gem, it pulls the latest mysql-chef_gem cookbook and fails. An update to the database cookbook was released to fix this, however Berks dep solving is getting the latest mysql-chef_gem and an older database cookbook for the webapp test cookbook.
| * Merge pull request #2616 from jaymzh/whitelistSerdar Sutay2014-12-102-1/+37
| |\ | | | | | | Fix attribute whitelisting
| | * Add specPhil Dibowitz2014-12-101-0/+34
| | |
| | * Fix attribute whitelistingPhil Dibowitz2014-12-101-1/+3
| |/ | | | | | | False-y values are still there.
| * Catch 'unknown protocol' errors in ssl fetch and explain themdanielsdeleo2014-12-102-10/+56
| | | | | | | | | | | | The error message from OpenSSL when connecting to a non-ssl service is confusing--it looks like a certificate validation failure. Catch the error and explain what caused it.
| * 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
| |\ | | | | | | Resolve the circular dependency between ProviderResolver and Resource.
| | * Update changelog based on 12.0.1 and include CHANGELOG info for ↵Serdar Sutay2014-12-101-6/+14
| | | | | | | | | | | | https://github.com/opscode/chef/pull/2610.
| | * 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 dependencies
| | * Fix Digester to require its dependenciesPhil Dibowitz2014-12-091-0/+1
| |/ | | | | | | | | | | | | | | Without thus using rspec gets you: ``` uninitialized constant Chef::Digester::Singleton ```
| * Merge pull request #2582 from jtimberman/jtimberman/brew-info-installedJoshua Timberman2014-12-093-1/+36
| |\ | | | | | | Fixes #2578, check that `installed` isn't empty
| | * add CHANGELOG.md entry for homebrew provider fixjtimberman2014-12-091-0/+1
| | |