summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* [HelpSpot 16643] Allow 10-stable to source local remote_filesh/remote_file_local_source_10-stableSean Horn2014-01-171-2/+17
* Bump the version number for release.10.30.2sersut2013-12-0554-102/+102
* 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
* 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 ar...sersut2013-12-021-1/+6
|/
* backport of CHEF-4662 to 10-stableLamont Granquist2013-11-264-55/+176
* 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 correctly formeddanielsdeleo2013-11-252-6/+18
|/
* 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
|\
| * 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-stableLamont Granquist2013-11-216-67/+99
* | | Merge pull request #1140 from opscode/pick-shellout-rcSerdar Sutay2013-11-211-1/+1
|\ \ \ | |_|/ |/| |
| * | 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
|\ \ | |/ |/|
| * 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
| * Add test for whyrun-safe in ruby blocksPhil Dibowitz2013-11-212-7/+21
| * [CHEF-4110] Add a "whyrun_safe" attribute to ruby_blockPhil Dibowitz2013-11-212-2/+21
|/
* Merge pull request #1138 from opscode/backport-data-bag-saveSerdar Sutay2013-11-212-9/+6
|\
| * Make Chef::DataBag.save use POST instead of PUTSerdar Sutay2013-11-212-9/+6
* | Merge branch 'CHEF-4616-10-stable' into 10-stabledanielsdeleo2013-11-217-16/+154
|\ \
| * | 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
| * | Patch ruby 2.0 Net::HTTP proxy code for IPv6danielsdeleo2013-11-211-0/+34
|/ /
* | Merge pull request #1136 from opscode/CHEF-3297-10-stableSerdar Sutay2013-11-2125-198/+811
|\ \ | |/ |/|
| * 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
|/
* Merge pull request #1119 from opscode/CHEF-4380-10-stableSerdar Sutay2013-11-061-0/+1
|\
| * Merge pull request #899 from juliandunn/CHEF-4380Serdar Sutay2013-11-061-0/+1
|/
* Merge pull request #1118 from opscode/CHEF-4631Serdar Sutay2013-11-066-231/+559
|\
| * Fix a comment.sersut2013-11-061-2/+1
| * Config option to restore previous array merging behavior in deep_merge when n...sersut2013-11-062-22/+37
| * 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
* | Merge branch 'CHEF-1848-10-stable' into 10-stabledanielsdeleo2013-11-053-25/+51
|\ \