CHEF-4101: DeepMerge - support overwriting hash values with nil
add CHANGELOG.md for PR#719
Merge pull request #1851 from opscode/lcg/chef-4101

CHEF-4101: DeepMerge - support overwriting hash values with nil
add retries in additional cases
Revert "add retries in additional cases"

Pushed straight to master again, I need to stop coding...

This reverts commit fb58236637095e22f25ed17143e435f4a58d7d6c.
Have freebsd port use pkg info if the freebsd version is >= 10000017
retry on HTTP 50X Error when calling Chef REST API
Add supermarket_attributes to Metadata

Allow the metadata.rb in a cookbook to specify arbitrary attributes for
use from Supermarket. The usecase for this right now would be setting the issues
and source URLs for that Cookbook instead of specifying them in the
Supermarket UI.
Fix typo in Metadata documentation.
Warn on using 'everything' for knife download on a hosted setup PR #1913
Merge branch 'jm/warn_on_everything' PR #1913
Use individual URL attributes in metadata

Instead of having an arbitrary Hash/Mash of supermarket_attributes, use two
explicit URL attributes at the top level of the metadata: the source_url and
issues_url.
Ensure metadata responds to method before sending, use public_send
Should use client_name instead of node_name
Remove the bootstrap templates that does chef install via gems.
Deprecate --distro and --template-file options in favor of --template.
Remove encrypted_data_bag_secret distribution via Chef::Config and enable distributing it via knife[:secret] and knife[:secret_file].
Fixes based on the PR comments.
Specs for bootstrap cleanup.
Fixes based on PR comments.