summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* adding myself to MAINTAINERSlcg/maintainerLamont Granquist2014-12-011-1/+10
|
* Merge pull request #2490 from jtimberman/jtimberman/maintainersJon Cowie2014-11-281-0/+5
|\ | | | | Adding myself to relevant component maintainer
| * Adding myself to relevant component maintainerjtimberman2014-11-281-0/+5
|/
* Merge pull request #2485 from opscode/ssd/maintainer-appJon Cowie2014-11-281-1/+2
|\ | | | | Add Steven Danna as a maintainer of Dev Tools
| * Add Steven Danna as a maintainer of Dev Toolsssd/maintainer-appSteven Danna2014-11-251-1/+2
| | | | | | | | | | | | I've fixed a number of chef-shell and knife related bugs, written a number of popular knife plugins that build on top of these systems, and understand the related code well.
* | Ensure 'uri' is required where it's used.danielsdeleo2014-11-265-0/+5
| | | | | | | | | | URI previously was globally available because chef.rb loaded it via a monkey patch for the URI class.
* | Remove 1.8 and 1.9 specific monkey patchesdanielsdeleo2014-11-2615-412/+0
| |
* | 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/+5
| |
* | drop ruby 1.9.x support for Chef-12Lamont Granquist2014-11-251-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.
* | Merge pull request #2484 from opscode/tball/contrib-passTyler Ball2014-11-2549-75/+104
|\ \ | | | | | | Merging community contributions
| * \ Merge branch 'master' into tball/contrib-passtyler-ball2014-11-258-5/+119
| |\ \ | | | | | | | | | | | | | | | | Conflicts: CHANGELOG.md
| * | | Fixing failing tests on mergetyler-ball2014-11-251-4/+4
| | | |
| * | | Contribution information for https://github.com/opscode/chef/pull/2385tyler-ball2014-11-251-0/+2
| | | |
| * | | Contribution information for https://github.com/opscode/chef/pull/2382tyler-ball2014-11-251-0/+2
| | | |
| * | | Merge branch 'master' of https://github.com/tas50/chef-1 into tball/contrib-passtyler-ball2014-11-253-8/+8
| |\ \ \
| | * | | Fix some minor typosTim Smith2014-11-083-9/+9
| | | | |
| * | | | Merge branch 'typofixes-vlajos-20141107' of github.com:vlajos/chef into ↵tyler-ball2014-11-2545-61/+61
| |\ \ \ \ | | | | | | | | | | | | | | | | | | tball/contrib-pass
| | * | | | typo fixes - https://github.com/vlajos/misspell_fixerVeres Lajos2014-11-0845-61/+61
| | |/ / /
| * | | | Contribution information for https://github.com/opscode/chef/pull/2242tyler-ball2014-11-251-0/+2
| | | | |
| * | | | Merge branch 'patch-3' of github.com:justanshulsharma/cheftyler-ball2014-11-252-6/+29
| |\ \ \ \
| | * | | | Update node_run_list_remove_spec.rbAnshul Sharma2014-11-041-1/+1
| | | | | |
| | * | | | swapped linesAnshul Sharma2014-11-041-2/+2
| | | | | |
| | * | | | added testsAnshul Sharma2014-10-181-3/+18
| | | | | |
| | * | | | Updated bannerAnshul Sharma2014-10-181-1/+1
| | | | | |
| | * | | | remove extra spacesAnshul Sharma2014-10-161-3/+0
| | | | | |
| | * | | | knife node run_list remove issue #2186Anshul Sharma2014-10-161-2/+13
| | | | | | | | | | | | | | | | | | fixes "knife node run_list remove" issue #2186
* | | | | | Merge pull request #2459 from opscode/lcg/partial-deep-merge-cacheLamont Granquist2014-11-250-0/+0
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | add partial deep merge cache
| * | | | | add more commentarylcg/partial-deep-merge-cacheLamont Granquist2014-11-201-4/+20
| | | | | |
| * | | | | add partial deep merge cacheLamont Granquist2014-11-203-12/+65
| | | | | |
* | | | | | Merge pull request #2487 from opscode/lcg/fix-windows-warnLamont Granquist2014-11-252-3/+3
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | suppress locale -a warnings on windows
| * | | | | suppress locale -a warnings on windowsLamont Granquist2014-11-252-3/+3
|/ / / / / | | | | | | | | | | | | | | | | | | | | need the '!' to throw exceptions, or else the rescue clause is never run.
* | | | | Merge pull request #2483 from opscode/sersut/contrib-passSerdar Sutay2014-11-255-2/+28
|\ \ \ \ \ | | | | | | | | | | | | Merge pass for contributions.
| * | | | | Contribution information for https://github.com/opscode/chef/pull/2439.Serdar Sutay2014-11-251-0/+2
| | | | | |
| * | | | | Merge branch 'fix_prerelease_parameter' of github.com:Daegalus/chefSerdar Sutay2014-11-252-1/+15
| |\ \ \ \ \
| | * | | | | Fix installer_version_string to be an array on prerelease parameter.Yulian Kuncheff2014-11-242-1/+15
| | | | | | |
| * | | | | | Contribution information for https://github.com/opscode/chef/pull/2452.Serdar Sutay2014-11-251-0/+2
| | | | | | |
| * | | | | | Merge branch 'empty_version' of github.com:lucywyman/chefSerdar Sutay2014-11-252-1/+9
| |\ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |
| | * | | | | Setting version to an empty string in testslucywyman2014-11-192-1/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Check for nil and length on version in package/rubygems tests In gemspec test change @new_resource.instance_variable_set() to @new_resource.version()
* | | | | | | Merge pull request #2423 from jonlives/masterAdam Jacob2014-11-251-0/+88
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | Adding MAINTAINERS.md file per RFC-030 and proposing myself as maintainer for Core & Enterprise Linux
| * | | | | | Add @jaymzh as core maintainerJon Cowie2014-11-141-0/+2
| | | | | | |
| * | | | | | Adding MAINTAINERS.md file per RFC-030 and proposing myself as maintainer ↵Jon Cowie2014-11-141-0/+86
| | | | | | | | | | | | | | | | | | | | | | | | | | | | for Core & Enterprise Linux
* | | | | | | Merge pull request #2445 from juliandunn/remove-travis-187-workaroundJulian C. Dunn2014-11-241-11/+2
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | Revert rubygems 2.2.0 with bundler 1.5 with Ruby 1.8.7 fix
| * | | | | | Put back "gem update --system"Julian C. Dunn2014-11-181-0/+4
| | | | | | |
| * | | | | | Revert 7ff6de20561ba20b0a6876c66e1ddd3271a10084 as we don't need itJulian C. Dunn2014-11-181-13/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | anymore; bug has been fixed plus we don't care about Ruby 1.8.7.
* | | | | | | Merge pull request #2462 from opscode/lcg/remove-knockout-mergeSerdar Sutay2014-11-238-94/+109
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | remove old knockout merge exception
| * | | | | | | WIP: immutabilizing deep mergelcg/remove-knockout-mergeLamont Granquist2014-11-213-6/+20
| | | | | | | |
| * | | | | | | deleted the last end accidentallyLamont Granquist2014-11-212-2/+5
| | | | | | | |
| * | | | | | | #role_merge becomes #merge not #deep_mergeLamont Granquist2014-11-211-3/+2
| | | | | | | |