summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* [CHEF-3075] Allow 1 character environment names.ssd/CHEF-3075-chef10Steven Danna2013-12-052-1/+7
| | | | | | String#chop will remove the last character of a string, preventing single-character environment names. String#chomp removes the last character only if it is the record separator.
* Bump the version number for a new RC.10.30.2.rc.0sersut2013-12-0454-102/+102
|
* Do not attempt to JSON parse the body of a 204 response.danielsdeleo2013-12-042-1/+20
| | | | | | | An HTTP 204 No Content response may have a Content-Type header even though it has no content--this is not disallowed by the RFC. Update Chef::REST to handle this case and not attempt to parse the (nil) response.
* Bump up the version number for release.10.30.0sersut2013-12-0354-102/+102
|
* Pick up 1.3.0 of mixlib-shellout in the dependencies.sersut2013-12-031-1/+1
|
* Backport the missing test update for Tempfile security fix.sersut2013-12-021-2/+2
|
* Bump the version number for 10.30.0.rc.210.30.0.rc.2sersut2013-12-0254-126/+126
|
* Merge pull request #1155 from opscode/nil_attr_merge_fixSerdar Sutay2013-12-021-1/+6
|\ | | | | Make sure the attributes with value nil are not converted to { } when they are being merged at the same precedence level.
| * Make sure the attributes with value nil are not converted to { } when they ↵sersut2013-12-021-1/+6
|/ | | | are being merged at the same precedence level.
* backport of CHEF-4662 to 10-stableLamont Granquist2013-11-264-55/+176
| | | | - insecure Tempfile perms fixes
* Bump up the version number for RC.10.30.0.rc.1sersut2013-11-2554-126/+126
|
* Merge branch 'ipv6-host-header' into 10-stabledanielsdeleo2013-11-252-6/+18
|\ | | | | | | | | | | | | | | | | | | | | | | Ensure Host header is set manually for all requests. This works around an issue with Net::HTTP where the Host header is missing the necessary brackets when the Host is identified by IPv6 address. E.g., Good: Host: [::1]:8888 Bad: Host: ::1:8888
| * Ensure Host header is correctly formeddanielsdeleo2013-11-252-6/+18
|/ | | | | | | | | | Net::HTTP does not set the Host header correctly when the host is given as an IPv6 address. Previous testing determined that Chef was setting the correct Host header in the authentication code, but did not set the Host header for non-authenticated requests, so the Net::HTTP default behavior (bug) would be exposed. Set Host header "manually" for all requests to hide the Net::HTTP bug.
* Merge branch 's3-auth-regression-fix' into 10-stabledanielsdeleo2013-11-252-1/+31
|\
| * Add regression test for content type mangling issuedanielsdeleo2013-11-251-0/+30
| |
| * Don't change content type in Chef::REST if one was provideddanielsdeleo2013-11-251-1/+1
|/
* Bump the version numbers for 10.30.0 release candidate.10.30.0.rc.0Serdar Sutay2013-11-216-6/+6
|
* Merge pull request #1143 from opscode/windows-spec-fixesSerdar Sutay2013-11-214-3/+6
|\ | | | | Windows Spec Fixes
| * Make sure the tempfile exists before closing it.Serdar Sutay2013-11-212-1/+4
| |
| * Make the :fork check on windows more reliable.Serdar Sutay2013-11-212-2/+2
| |
* | Merge pull request #1141 from opscode/lcg/OC-10380-10-stablelamont-granquist2013-11-216-67/+99
|\ \ | | | | | | back port of OC-10380 to 10-stable
| * | back port of OC-10380 to 10-stableLamont Granquist2013-11-216-67/+99
| | |
* | | Merge pull request #1140 from opscode/pick-shellout-rcSerdar Sutay2013-11-211-1/+1
|\ \ \ | |_|/ |/| | Pick mixlib-shellout 1.3.0.rc.0 to prepare for 10.30.0.rc.0
| * | Pick 1.3.0.rc.0 to prepare for 10.30.0.rc.0Serdar Sutay2013-11-211-1/+1
| |/
* | Merge pull request #1116 from jaymzh/CHEF-4110-10stablePhil Dibowitz2013-11-217-1/+112
|\ \ | |/ |/| [CHEF-4110-10stable] Add a "whyrun_safe" attribute to ruby_block
| * Add formatter output for whyrun_safe_ruby_blockPhil Dibowitz2013-11-211-0/+1
| |
| * Move to making a seprate resource/providerPhil Dibowitz2013-11-219-36/+112
| |
| * Revert Chef::Config[:why_run] after testPhil Dibowitz2013-11-212-1/+2
| | | | | | | | Also, don't claim to be a state_attr.
| * Add test for whyrun-safe in ruby blocksPhil Dibowitz2013-11-212-7/+21
| | | | | | | | Also refactor the code to be slightly cleaner and fix 'updated' bug.
| * [CHEF-4110] Add a "whyrun_safe" attribute to ruby_blockPhil Dibowitz2013-11-212-2/+21
|/ | | | 10-stable edition
* Merge pull request #1138 from opscode/backport-data-bag-saveSerdar Sutay2013-11-212-9/+6
|\ | | | | Make Chef::DataBag.save use POST instead of PUT
| * Make Chef::DataBag.save use POST instead of PUTSerdar Sutay2013-11-212-9/+6
| | | | | | | | | | | | 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.
* | Merge branch 'CHEF-4616-10-stable' into 10-stabledanielsdeleo2013-11-217-16/+154
|\ \ | | | | | | | | | https://tickets.opscode.com/browse/CHEF-4616
| * | Correctly handle IPv6 literals in chef_server_url (10.x)danielsdeleo2013-11-212-16/+13
| | |
| * | Force knife to load http monkey patchesdanielsdeleo2013-11-211-0/+2
| | |
| * | Backport URI::Generic#hostname to Ruby 1.9.2 and olderdanielsdeleo2013-11-213-0/+105
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | Patch ruby 2.0 Net::HTTP proxy code for IPv6danielsdeleo2013-11-211-0/+34
|/ / | | | | | | | | | | | | | | | | | | 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.
* | Merge pull request #1136 from opscode/CHEF-3297-10-stableSerdar Sutay2013-11-2125-198/+811
|\ \ | |/ |/| Porting CHEF-3297 to 10-stable.
| * Add the mising solaris filter.sersut2013-11-201-0/+1
| |
| * Sync windows gem versions based on 11-stable branch.sersut2013-11-201-5/+6
| |
| * Merge pull request #1134 from opscode/CHEF-3297sersut2013-11-2024-193/+804
|/ | | | | | | | | | | | | | 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
* Merge pull request #1119 from opscode/CHEF-4380-10-stableSerdar Sutay2013-11-061-0/+1
|\ | | | | CHEF-4380: package resource with "source" is broken on EL6 using 11.6.0rc3
| * Merge pull request #899 from juliandunn/CHEF-4380Serdar Sutay2013-11-061-0/+1
|/ | | | [CHEF-4380] Fix missing include on shellout mixin
* Merge pull request #1118 from opscode/CHEF-4631Serdar Sutay2013-11-066-231/+559
|\ | | | | CHEF-4596 / CHEF-4631 : Pick the array that is higher in the precedence order instead of merging during deep merge
| * Fix a comment.sersut2013-11-061-2/+1
| |
| * Config option to restore previous array merging behavior in deep_merge when ↵sersut2013-11-062-22/+37
| | | | | | | | needed.
| * Specs for the intended behavior of CHEF-4631.sersut2013-11-063-204/+496
| |
| * When merging two arrays during deep merge:sersut2013-10-302-25/+47
| | | | | | | | | | | | | | If merge is happening across the precedence levels (i.e. default, override, etc...) Pick the array from the higher precedence level If merge is happening at the same precendence level (i.e. when we are merging role default attribute with node default attributes) Concatanate the arrays.
* | Merge branch 'CHEF-1848-10-stable' into 10-stabledanielsdeleo2013-11-053-25/+51
|\ \
| * | Pass custom headers when following a redirectdanielsdeleo2013-11-052-1/+5
| | | | | | | | | | | | Fixes CHEF-1848: https://tickets.opscode.com/browse/CHEF-1848
View Lorry Controller Status