summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into merging-mastermerging-mastertyler-ball2014-12-0588-687/+443
|\ | | | | | | | | Conflicts: lib/chef/version.rb
| * pinning ohai to 8.xLamont Granquist2014-12-031-1/+1
| |
| * setting master to 12.1.0.dev.0 to drop ancient devodd policyLamont Granquist2014-12-031-1/+1
| |
| * Merge pull request #2532 from juliandunn/remove-agentJulian C. Dunn2014-12-032-19/+0
| |\ | | | | | | Remove unused "agent".
| | * Remove unused "agent".Julian C. Dunn2014-12-032-19/+0
| | | | | | | | | | | | | | | This was probably an aborted attempt to integrate this project into Chef: https://github.com/opscode/opscode-agent
| * | Merge pull request #2527 from opscode/lcg/knife-plugin-fixLamont Granquist2014-12-034-6/+23
| |\ \ | | |/ | |/| fix searching upwards for knife plugins
| | * 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.
| * Merge pull request #2516 from adamhjk/ez-modeAdam Jacob2014-12-022-0/+19
| |\ | | | | | | A memorial for Ezra Zygmuntowicz
| | * A memorial for Ezra ZygmuntowiczAdam Jacob2014-12-012-0/+19
| | | | | | | | | | | | | | | | | | | | | | | | Adding the --ez switch to Chef Solo, to memorialize Ezra. He was the father of Chef Solo, and without his early advocacy and evangelism, there would be no Chef today. Rest in peace, Ez.
| * | Merge pull request #2526 from opscode/mcquin/maintainerAdam Jacob2014-12-021-23/+19
| |\ \ | | | | | | | | Make me a maintainer
| | * | Add myself as a core maintainer.Claire McQuin2014-12-021-0/+1
| | | |
| | * | Use lists.Claire McQuin2014-12-021-23/+18
| |/ /
| * | adding myself to MAINTAINERSLamont Granquist2014-12-011-1/+10
| | |
| * | Add myself to MAINTAINERSdanielsdeleo2014-12-011-0/+4
| | |
| * | Merge pull request #2499 from juliandunn/trash-shefJoshua Timberman2014-12-013-55/+1
| |\ \ | | |/ | |/| Remove all parts of 'shef'
| | * Remove all parts of 'shef'Julian C. Dunn2014-11-263-55/+1
| | |
| * | Add Seth Vargo as LT for ChefSpecAdam Jacob2014-12-011-3/+5
| | |
| * | Merge pull request #2510 from opscode/tball/maintainerAdam Jacob2014-12-011-0/+5
| |\ \ | | | | | | | | Adding myself as a maintainer
| | * | Fixing formattingtball/maintainertyler-ball2014-12-011-0/+4
| | | |
| | * | Adding myself as a maintainertyler-ball2014-12-011-1/+2
| |/ /
| * | 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
| | | | | | |
View Lorry Controller Status