summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Update Changelog to reflect resolution of #2348jdm/2348-11-stableJay Mundrawala2015-01-261-2/+5
|
* Merge pull request #2774 from chef/jdm/powershell-2348Jay Mundrawala2015-01-262-2/+17
| | | | Fix up powershell script
* Merge pull request #2811 from chef/jdm/11.18.6Jay Mundrawala2015-01-262-2/+5
|\ | | | | Prepare 11.18.6
| * Prepare 11.18.611.18.6Jay Mundrawala2015-01-262-2/+5
|/
* Merge pull request #2792 from chef/jdm/11.18.411.18.4Jay Mundrawala2015-01-231-2/+5
|\ | | | | Prepare 11.18.4
| * Prepare 11.18.4Jay Mundrawala2015-01-231-2/+5
|/
* Merge pull request #2791 from chef/jdm/11.18.211.18.2Jay Mundrawala2015-01-231-0/+4
|\ | | | | Prepare 11.18.2 release
| * Prepare 11.18.2 releaseJay Mundrawala2015-01-231-0/+4
|/
* Merge pull request #2750 from opscode/jdm/prepare-11.18.011.18.0Jay Mundrawala2015-01-132-2/+4
|\ | | | | Prepare Chef 11.18.0 release
| * Bump version for 11.18.0 releaseJay Mundrawala2015-01-131-1/+1
| |
| * Update Changelog to reflect resolution of #2345Jay Mundrawala2015-01-131-1/+3
|/
* Merge pull request #2749 from opscode/jdm/metadata-error-infoJay Mundrawala2015-01-133-4/+12
| | | | Provide more info when cookbook metadata is not found
* Merge pull request #2748 from opscode/jdm/2345-11-backportJay Mundrawala2015-01-133-126/+198
|\ | | | | Allow knife to install cookbooks with metadata.json
| * Allow knife to install cookbooks with metadata.jsonJay Mundrawala2015-01-133-126/+198
|/ | | | Backport of PRs #2642 and #2345 to chef 11-stable
* Merge pull request #2074 from opscode/ryan/group_post-11-stableSerdar Sutay2014-11-192-1/+68
|\ | | | | Populate the actors when creating groups
| * Add unit test for group normalization in ChefFSRyan Cragun2014-11-192-1/+64
| |
| * Populate the actors when creating groupsRyan Cragun2014-11-031-0/+4
| |
* | Bump version for 11.18.0.rc.111.18.0.rc.1danielsdeleo2014-11-131-2/+1
| |
* | Fix conflicting data in test casesdanielsdeleo2014-11-131-4/+4
| |
* | Update version and changelog for 11.18.0 RC011.18.0.rc.0danielsdeleo2014-11-132-2/+4
| |
* | Merge branch 'chef-dk-227' into 11-stabledanielsdeleo2014-11-132-1/+90
|\ \ | |/ |/|
| * Add test data for chef-dk#227 regex strictnessdanielsdeleo2014-11-131-2/+19
| | | | | | | | | | Confirm that we won't accidentally break plugins with names like `chef-foo` or `foo-chef`.
| * Add regression test for #chef-dk#227 extraneous load issuedanielsdeleo2014-11-131-1/+49
| | | | | | | | Verified this fails when commenting the fix in the previous commit.
| * Ignore knife subcommands from other chef installsdanielsdeleo2014-11-131-0/+24
| |
* | Merge pull request #2297 from opscode/tball/updating-chef-zeroTyler Ball2014-10-291-1/+1
|\ \ | | | | | | Using released chef-zero which uses ffi-yajl instead of JSON gem
| * | Using released chef-zero which uses ffi-yajl instead of JSON gemtball/updating-chef-zerotyler-ball2014-10-241-1/+1
| | |
* | | Merge pull request #2236 from opscode/adamedx/dsc-params-11-stableAdam Edwards2014-10-292-50/+94
|\ \ \ | | | | | | | | Port Issue #2209: DSC parameters should be passed even when there is no config data file
| * | | Remove unnecessary contexts in DSC functional specsadamedx/dsc-params-11-stableAdam Edwards2014-10-271-44/+36
| | | |
| * | | DSC terminology correction in insufficient powershell version messageAdam Edwards2014-10-271-1/+1
| | | |
| * | | DSC parameters should be passed even when there is no config data fileAdam Edwards2014-10-272-6/+58
|/ / /
* | | Merge pull request #2305 from opscode/jdmundrawala/11-env-splitJay Mundrawala2014-10-273-23/+103
|\ \ \ | | | | | | | | Pick pull request #2252 from master
| * | | Merge pull request #2252 from opscode/jdmundrawala/env-splitjdmundrawala/11-env-splitJay Mundrawala2014-10-263-23/+103
|/ / / | | | | | | | | | Modified env resource to break values up by delimiter before comparing
* | | Merge pull request #2298 from opscode/jdmundrawala/11-issue-2225Jay Mundrawala2014-10-252-9/+18
|\ \ \ | | | | | | | | Cherrypick pull request #2264 from opscode/jdmundrawala/issue-2225
| * | | 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