GitLab

Windows Spec Fixes

back port of OC-10380 to 10-stable

Pick mixlib-shellout 1.3.0.rc.0 to prepare for 10.30.0.rc.0

[CHEF-4110-10stable] Add a "whyrun_safe" attribute to ruby_block

Also, don't claim to be a state_attr.

Also refactor the code to be slightly cleaner and fix 'updated' bug.

10-stable edition

Make Chef::DataBag.save use POST instead of PUT

PUT doesn't make sense in DataBag context since you can't update a data bag.
Chef::DataBag.save should rescue a 409 response since that indicates the data
bag already exists.

https://tickets.opscode.com/browse/CHEF-4616

Documentation for URI::Generic#host in Ruby 2.0.0 explains:

    Since IPv6 addresses are wrapped by brackets in URIs, this method
    returns IPv6 addresses wrapped by brackets. This form is not appropriate
    to pass socket methods such as TCPSocket.open. If unwrapped host names
    are required, use “hostname” method.

Therefore the best way to support IPv6 URIs is to replace calls to
URI::Generic#host with URI::Generic#hostname. The #hostname method is
added in Ruby 1.9.3 so we need to backport it for older ruby versions.

Conflicts:
	chef/lib/chef.rb

Ruby 2.0 changes the way proxying is implemented in Net::HTTP such that
each request will check the URI for "proxy-ness." This check will
generate a URL from the given address and port without wrapping IPv6
addresses in brackets, which triggers an error in the URI library.

Check for this case on startup and monkey patch the offending method if
necessary.

Porting CHEF-3297 to 10-stable.

CHEF-3297: Add excluded_members property to the group resources
Conflicts:

	chef/lib/chef/provider/group.rb
	chef/lib/chef/provider/group/usermod.rb
	chef/lib/chef/resource/group.rb
	chef/spec/unit/provider/group/pw_spec.rb
	chef/spec/unit/provider/group/usermod_spec.rb
	spec/functional/resource/group_spec.rb
	spec/spec_helper.rb
	spec/support/platform_helpers.rb

CHEF-4380: package resource with "source" is broken on EL6 using 11.6.0rc3

[CHEF-4380] Fix missing include on shellout mixin

CHEF-4596 / CHEF-4631 : Pick the array that is higher in the precedence order instead of merging during deep merge

Fixes CHEF-1848: https://tickets.opscode.com/browse/CHEF-1848

Conflicts:
	chef/lib/chef/exceptions.rb

Fixes CHEF-2682 for 10-stable

We assume in whyrun mode that a non-existant user would be created before we
attempt to lock it, so we return false from #check_lock when user does not
exist and we are in why_run mode.

Fix windows gem dependencies on 10-stable

Minimally bump the version numbers of windows gems so that we don't have a conflict with mixlib-shellout gems.