summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #2264 from opscode/jdmundrawala/issue-2225jdmundrawala/11-issue-2225Jay Mundrawala2014-10-242-9/+18
| | | | Improve detection missing WhatIf support
* Merge pull request #2294 from opscode/jdmundrawala/11-lcm-renamesJay Mundrawala2014-10-242-7/+7
|\ | | | | Renamed output_has_dsc_module_failure to dsc_module_import_failure
| * Merge pull request #2281 from opscode/jdmundrawala/lcm-renamesjdmundrawala/11-lcm-renamesJay Mundrawala2014-10-242-7/+7
|/ | | | Renamed output_has_dsc_module_failure to dsc_module_import_failure
* Merge pull request #2240 from opscode/sersut/backport-supermarket-switchSerdar Sutay2014-10-178-12/+13
|\ | | | | Backport cookbooks.opscode.com -> supermarket change to 11-stable.
| * Merge pull request #1871 from opscode/lcg/supermarket-urlssersut/backport-supermarket-switchlamont-granquist2014-10-168-12/+13
|/ | | | | | | | Lcg/supermarket urls Conflicts: CHANGELOG.md spec/unit/knife/cookbook_site_download_spec.rb spec/unit/knife/cookbook_site_share_spec.rb
* Merge pull request #2218 from opscode/jdmundrawala/11-stable-issue-2169Jay Mundrawala2014-10-133-7/+8
|\ | | | | Cherry-pick #2190 from opscode/jdmundrawala/issue-2169
| * Updated changelog to reflect solution for issue 2169jdmundrawala/11-stable-issue-2169Jay Mundrawala2014-10-131-0/+1
| |
| * Merge pull request #2190 from opscode/jdmundrawala/issue-2169Jay Mundrawala2014-10-132-7/+7
|/ | | | Try to apply dsc configuration even if what-if fails
* Merge pull request #2188 from opscode/jdmundrawala/11-stableJay Mundrawala2014-10-135-153/+168
|\ | | | | Cherry pick dsc_script bug fix into 11-stable
| * Update changelog for issue 2027jdmundrawala/11-stableJay Mundrawala2014-10-081-0/+1
| |
| * Merge pull request #2103 from opscode/jdmundrawala/issue-2027-masterJay Mundrawala2014-10-084-153/+167
| | | | | | | | We now check for powershell/dsc compat in provider.
* | Merge pull request #2217 from opscode/jdmundrawala/11-stable-env-path-spec-fixJay Mundrawala2014-10-131-4/+3
|\ \ | | | | | | Cherry-pick #2208 from opscode/jdmundrawala/env-path-spec-fix
| * | Merge pull request #2208 from opscode/jdmundrawala/env-path-spec-fixjdmundrawala/11-stable-env-path-spec-fixJay Mundrawala2014-10-131-4/+3
|/ / | | | | | | restore ENV['PATH'] in env_spec after test is complete
* | Merge pull request #2205 from opscode/tball/11-stable-latest-ffi-yajlTyler Ball2014-10-102-3/+1
|\ \ | | | | | | Upgrading to latest ffi-yajl which contains fixes for Object#to_json
| * | Upgrading to latest ffi-yajl which contains fixes for Object#to_jsontball/11-stable-latest-ffi-yajltyler-ball2014-10-102-3/+1
|/ /
* | Exclude knife integration tests on server platformsBryan McLellan2014-10-0917-16/+19
|/ | | | | | Not all platforms (looking at you solaris) need bother running the knife tests because we don't consider them to be workstation platforms. Excluding them will reduce transient failures and speed up the tests.
* Merge pull request #2120 from opscode/tball/11-stable-yajl-replace-jsonTyler Ball2014-10-0879-187/+346
|\ | | | | Chef 11 - Switch JSON dependency for ffi-yajl
| * Adding back to prevent breaking people who use Hash.to_jsontball/11-stable-yajl-replace-jsontyler-ball2014-10-083-10/+6
| |
| * Using my ffi-yajl branch where I fixed Objects that do not support to_jsontyler-ball2014-10-081-0/+2
| |
| * Removing old .to_json monkeypatching for all objectstyler-ball2014-10-081-1/+0
| |
| * Moving documentation to CHANGELOG since no online documentation needs to ↵tyler-ball2014-10-082-5/+2
| | | | | | | | update with this
| * Ruby 1.8.7 does some weird hash printing where it gives different ordering - ↵tyler-ball2014-10-081-2/+2
| | | | | | | | simplifying test to avoid that
| * Fixing integration tests I didn't check last time I committedtyler-ball2014-10-085-10/+25
| |
| * First pass at removing JSON dependency, switching it for ffi-yajltyler-ball2014-10-0874-176/+326
| |
* | Add the forgotten change for 11.16.2 in to the CHANGELOG.Serdar Sutay2014-10-081-1/+2
|/
* Merge pull request #2183 from opscode/sersut/travis-fixSerdar Sutay2014-10-071-1/+0
|\ | | | | Remove Ruby 1.8.7 from travis config.
| * Remove Ruby 1.8.7 from travis config.sersut/travis-fixSerdar Sutay2014-10-071-1/+0
|/
* Merge pull request #2182 from opscode/sersut/rel-11.16.411.16.4Serdar Sutay2014-10-073-41/+12
|\ | | | | CHANGELOG and version updates for 11.16.4.
| * CHANGELOG and version updates for 11.16.4.Serdar Sutay2014-10-073-41/+12
|/
* Merge pull request #2179 from opscode/sersut/port-policyfile-fixSerdar Sutay2014-10-0717-23/+128
|\ | | | | Make FileVendor configuration specific to the two implementations
| * Make FileVendor configuration specific to the two implementationssersut/port-policyfile-fixdanielsdeleo2014-10-0717-23/+128
|/ | | | | | | | | | | | | | | | FileVendor previously was configured by storing a closure/anonymous function as a class instance variable. This had the following downsides: * The API was too general, which caused a lot of code repetition * The block was lazily evaluated, which hid errors and made testing more difficult * The closures captured references to classes with references to large data structures, which complicates GC. Since we've only ever had the same two implementations of FileVendor, we can encapsulate configuration of the FileVendor factory by wrapping each configuration option in a method. As a side benefit, arguments to these methods will be eagerly evaluated, which makes it easier to detect errors.
* Merge pull request #2142 from opscode/jdmundrawala/11-windows-env-fixJay Mundrawala2014-10-066-187/+329
|\ | | | | Jdmundrawala/11 windows env fix
| * Updated CHANGELOG for env resource changejdmundrawala/11-windows-env-fixJay Mundrawala2014-09-301-2/+6
| |
| * Merge pull request #2024 from opscode/jdmundrawala/windows_env_pathJay Mundrawala2014-09-305-185/+323
| | | | | | | | | | | | Windows path fix Conflicts: spec/functional/resource/env_spec.rb
* | Merge pull request #2151 from opscode/sersut/backport-chef-1912Serdar Sutay2014-10-022-13/+23
|\ \ | |/ |/| Merge pull request #1912 from jessehu/CHEF-ISSUE-1904
| * Merge pull request #1912 from jessehu/CHEF-ISSUE-1904sersut/backport-chef-1912Claire McQuin2014-10-022-13/+23
|/ | | | retry on HTTP 50X Error when calling Chef REST API
* Add the pending() guard to the 'when there's no reboot keys present' spec.Chris Doherty2014-09-291-2/+5
|
* DSCL resource says it doesn't support OS X below 10.7, so don't run it on 10.6.Chris Doherty2014-09-291-1/+2
|
* updating CHANGELOG for 11.16.211.16.2Lamont Granquist2014-09-161-2/+6
|
* bumping version to 11.16.2Lamont Granquist2014-09-161-1/+1
|
* Merge pull request #2021 from jaymzh/11-whyrunPhil Dibowitz2014-09-113-3/+54
|\ | | | | [11] Fix whyrun_safe_ruby_block regression
| * [11] Fix whyrun_safe_ruby_block regressionPhil Dibowitz2014-09-093-3/+54
|/ | | | `whyrun_safe_ruby_block` broke in the 11 changes.
* Add Jesse Hu as 11.16.0 MVPBryan McLellan2014-09-091-0/+1
|
* Bump version for 11.16.011.16.0adamedx2014-09-061-1/+1
|
* Merge pull request #2008 from opscode/adamedx/ohai-7-4-and-rc211.16.0.rc.2Adam Edwards2014-09-062-2/+2
|\ | | | | Depend on released Ohai 7.4 for Chef 11.16.0.rc.2
| * Bump version for 11.16.0.rc.2adamedx2014-09-051-1/+1
| |
| * Gemspec update for Ohai ~> 7.4 releaseadamedx2014-09-051-1/+1
|/
* Bump version for 11.16.0.rc.1 release11.16.0.rc.1adamedx2014-09-051-1/+1
|
* DscScript resource will raise an error if dsc is not availableJay Mundrawala2014-09-057-63/+147
|
* Merge pull request #1996 from opscode/adamedx/port-chef-1982-11Adam Edwards2014-09-053-30/+35
|\ | | | | Port Chef 1982 DSCL provider