summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Contribution information for backport of ↵sersut/backport-12.0.1Serdar Sutay2014-12-081-0/+1
| | | | https://github.com/opscode/chef/pull/2574
* Merge pull request #2574 from opscode/jdm/evt-log-constSerdar Sutay2014-12-081-3/+5
| | | | Fix issue where Windows::Constants could potentially not exist, causing win event log module to crash
* Merge pull request #2572 from opscode/sersut/win-fork-intervalSerdar Sutay2014-12-083-1/+16
| | | | | | Fix windows service when :interval is set Conflicts: CHANGELOG.md
* Merge pull request #2573 from opscode/sersut/bootstrap-context-aritySerdar Sutay2014-12-083-1/+6
| | | | | | Restore compatibility with knife-windows Conflicts: CHANGELOG.md
* Merge pull request #2571 from opscode/sersut/restore-pathSerdar Sutay2014-12-083-0/+22
| | | | | | Restore path attribute in execute resource with deprecation warning Conflicts: CHANGELOG.md
* Added CHANGELOG entry for Issue #2552Jay Mundrawala2014-12-081-0/+3
|
* Merge pull request #2554 from opscode/jdm/lwrp-providesJay Mundrawala2014-12-084-4/+4
| | | | Fix issue where LWRP resources using `provides` fails
* bumping version to 12.0.012.0.0Lamont Granquist2014-12-031-1/+1
|
* pinning ohai to 8.xLamont Granquist2014-12-031-2/+2
| | | | | Conflicts: chef.gemspec
* Fix knife plugin path searchingLamont Granquist2014-12-034-6/+23
| | | | | | | | | | | | | | | | | | Unreleased Chef 12.0.0 bug caught in testing where only the searching upwards from PWD to find .chef in order to get the plugin path for knife was busted. The chef_config_dir was being used before load_config was being called, so it was nil, which broke finding knife plugins. This was fixed by adding some lazy initialization of the config_loader object itself and the chef_config_dir. The reset_config_loader! is added entirely to reset the global state for unit testing. This whole class is a bit horrible and needs to have all its global state removed from it, class methods removed, class ivars and the class-variable-in-a-class-method-for-inheritance-lolwut needs to be removed. Unfortunately, that requires some delicate surgery because Chef::Knife gets used as a public API, and is beyond the scope of gettting Chef 12 shipped.
* Force TK to install prerelease Chef pkg for nowdanielsdeleo2014-11-261-1/+1
| | | | | | | In the future (after Chef 12.0.0 is released) we should remove this. For now, we need to force TK to install a prerelease version of the Chef package, so it will include Ruby 2.1, and therefore not choke on our requirement for Ruby >= 2.0
* Remove 1.9 from travis, bump 2.1 to .5 patch releasedanielsdeleo2014-11-261-4/+3
|
* update docs for dropping support of 1.9.3Lamont Granquist2014-11-263-3/+4
| | | | | Conflicts: CHANGELOG.md
* drop ruby 1.9.x support for Chef-12Lamont Granquist2014-11-261-1/+1
| | | | | | | | | | Ruby 1.9.3 is in security-only maintenance phase which means that bugs for the core ruby interpreter will not be fixed and Chef cannot support ruby 1.9.x. Users should be using omnibus-chef packages which come with a built-in ruby 2.x or should upgrade their own installations to ruby 2.x (and accept that ongoing upgrade and support cost). Chef 11 will continue to be shipped on ruby 1.9.x until Chef 11 is EOL.
* suppress locale -a warnings on windowsLamont Granquist2014-11-252-3/+3
| | | | | need the '!' to throw exceptions, or else the rescue clause is never run.
* Version tag for 12.0.0.rc.3.12.0.0.rc.3Serdar Sutay2014-11-241-1/+1
|
* Bump version for 12.0.0.rc.2 release.12.0.0.rc.2Serdar Sutay2014-11-231-1/+1
|
* Merge pull request #2477 from opscode/sersut/port-immut-mergeSerdar Sutay2014-11-238-94/+109
|\ | | | | Merge pull request #2462 from opscode/lcg/remove-knockout-merge
| * Merge pull request #2462 from opscode/lcg/remove-knockout-mergeSerdar Sutay2014-11-238-94/+109
|/ | | | | | remove old knockout merge exception Conflicts: spec/unit/mixin/deep_merge_spec.rb
* Merge pull request #2454 from opscode/sersut/port-attr-perfSerdar Sutay2014-11-195-107/+132
|\ | | | | Merge pull request #2447 from opscode/lcg/lazy-deep-merge2
| * Merge pull request #2447 from opscode/lcg/lazy-deep-merge2Serdar Sutay2014-11-195-107/+132
|/ | | | | | Lcg/lazy deep merge2 Conflicts: spec/unit/node/attribute_spec.rb
* Merge pull request #2450 from opscode/sersut/port-chef-2073Serdar Sutay2014-11-192-0/+67
|\ | | | | Merge pull request #2073 from opscode/ryan/group_post-master
| * Merge pull request #2073 from opscode/ryan/group_post-masterSerdar Sutay2014-11-192-0/+67
|/ | | | Populate the actors when creating groups
* Merge pull request #2440 from opscode/sersut/port-destdir-autoSerdar Sutay2014-11-194-11/+69
|\ | | | | Merge pull request #2424 from opscode/sersut/chef-2356
| * Merge pull request #2424 from opscode/sersut/chef-2356Serdar Sutay2014-11-194-11/+69
| | | | | | | | :auto mode for :file_staging_uses_destdir
* | stop recomputing locale -a constantlyLamont Granquist2014-11-182-36/+36
|/ | | | | | fixes an outstanding issue on the locale -a guessing also fixes perf issues in the rspec tests (e.g. deploy provider)
* Merge pull request #2427 from opscode/jdmundrawala/path-sep-refactorJay Mundrawala2014-11-171-10/+2
| | | | Use platform_specific_path in chef shell
* Pin version for 12.0.0.rc.1.12.0.0.rc.1Serdar Sutay2014-11-121-1/+1
|
* Merge pull request #2410 from opscode/sersut/port-sparc-fixSerdar Sutay2014-11-121-1/+7
|\ | | | | Merge pull request #2407 from opscode/sersut/ci-fix-sparc
| * Merge pull request #2407 from opscode/sersut/ci-fix-sparcSerdar Sutay2014-11-121-1/+7
|/ | | | Fix unit specs on Sparc.
* Changelog entry for Issue 2380Jay Mundrawala2014-11-111-0/+1
|
* Merge pull request #2395 from opscode/jdmundrawala/chef-shell-windowsJay Mundrawala2014-11-111-2/+10
| | | | chef-shell checks platform when looking for client.rb and solo.rb.
* Merge pull request #2394 from opscode/jdmundrawala/win-cookbook-ns-colJay Mundrawala2014-11-101-6/+5
| | | | Windows event logger no longer imports into the global namespace.
* Merge pull request #2389 from opscode/sersut/serv-prov-portSerdar Sutay2014-11-0922-286/+553
|\ | | | | Merge pull request #2336 from opscode/lcg/12-systemd-fixes
| * Merge pull request #2336 from opscode/lcg/12-systemd-fixessersut/serv-prov-portSerdar Sutay2014-11-0822-286/+553
|/ | | | | | | fix systemd for Ubuntu 14.10 Conflicts: CHANGELOG.md spec/unit/provider/service/systemd_service_spec.rb
* Merge pull request #2388 from opscode/sersut/port-nil-attr-revertSerdar Sutay2014-11-082-20/+3
|\ | | | | Merge pull request #2387 from opscode/sersut/revert-attr-nil-override
| * Merge pull request #2387 from opscode/sersut/revert-attr-nil-overrideSerdar Sutay2014-11-082-20/+3
|/ | | | | | Revert "CHEF-4101: DeepMerge - support overwriting hash values with nil" Conflicts: spec/unit/mixin/deep_merge_spec.rb
* Merge pull request #2386 from opscode/sersut/12-attr-portSerdar Sutay2014-11-087-44/+540
|\ | | | | Merge pull request #2097 from opscode/lcg/chef-12-attr
| * Merge pull request #2097 from opscode/lcg/chef-12-attrLamont Granquist2014-11-087-44/+540
|/ | | | | | Lcg/chef 12 attr Conflicts: spec/unit/node_spec.rb
* Merge pull request #2381 from opscode/sersut/12-port-follow-symlinkSerdar Sutay2014-11-073-1/+25
|\ | | | | Merge pull request #2370 from opscode/ryan/follow_symlinks
| * Merge pull request #2370 from opscode/ryan/follow_symlinksSerdar Sutay2014-11-073-1/+25
|/ | | | Make client.pem being a symlink a configurable option
* Merge pull request #2377 from opscode/sersut/12-port-knife-ec2Serdar Sutay2014-11-073-9/+36
|\ | | | | Merge pull request #2368 from opscode/sersut/knife-cloud-bootstrap-options
| * Merge pull request #2368 from opscode/sersut/knife-cloud-bootstrap-optionsSerdar Sutay2014-11-073-9/+36
|/ | | | Knife cloud plugins bootstrap problem with Chef 12 when using custom templates.
* Bring in cheffish and provisioning resources if they are installedchef-provisioning-12-stableJohn Keiser2014-11-051-0/+7
|
* cherry picking https://github.com/opscode/chef/pull/2326 to 12-stabletyler-ball2014-10-311-0/+1
|
* Merge pull request #2330 from opscode/sersut/cherry-pick-win-spec12.0.0.rc.0Serdar Sutay2014-10-301-2/+2
|\ | | | | Merge pull request #2328 from opscode/sersut/win-spec-fix
| * Merge pull request #2328 from opscode/sersut/win-spec-fixSerdar Sutay2014-10-301-2/+2
|/ | | | Fix windows specs for windows package type.
* Merge pull request #2327 from opscode/sersut/rc-spec-fixesSerdar Sutay2014-10-3011-62/+74
|\ | | | | RC Spec fixes for 12-stable
| * windows_package installer_type should be a symbolBryan McLellan2014-10-302-4/+4
| | | | | | | | | | | | | | Fixes #1997 Conflicts: spec/unit/resource/windows_package_spec.rb
| * Merge pull request #2313 from opscode/sersut/win-res-lookup-fixSerdar Sutay2014-10-3011-58/+70
| | | | | | | | | | | | Make sure windows_service and windows_package resources are found with the new dynamic provider resolver. Conflicts: spec/unit/resource/windows_package_spec.rb