summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Bump version of chef to 12.9.29 by Chef Versioner.v12.9.29Chef Versioner2016-04-053-3/+3
* Merge pull request #4802 from chef/shain/use_correct_jsonTyler Ball2016-04-051-0/+6
|\
| * Explicitly pin json gemScott Hain2016-04-051-0/+6
* | Bump version of chef to 12.9.28 by Chef Versioner.v12.9.28Chef Versioner2016-04-053-3/+3
* | Merge pull request #4709 from coderanger/init_commandNoah Kantrowitz2016-04-052-4/+24
|\ \
| * | Fix some nits. [ci skip]Noah Kantrowitz2016-04-051-3/+3
| * | Improved test coverage for behavior with *_command.Noah Kantrowitz2016-03-151-0/+14
| * | Restore the :enable check but only look for service_missing and give a cleare...Noah Kantrowitz2016-03-151-0/+6
| * | Setting init_command should be accepted instead of specific command overrides.Noah Kantrowitz2016-03-141-2/+2
* | | Bump version of chef to 12.9.27 by Chef Versioner.v12.9.27Chef Versioner2016-04-053-3/+3
* | | Merge pull request #4798 from chef/tm/provider_no_opThom May2016-04-053-0/+62
|\ \ \ | |_|/ |/| |
| * | Add a NoOp providertm/provider_no_opThom May2016-04-043-0/+62
* | | Bump version of chef to 12.9.26 by Chef Versioner.v12.9.26Chef Versioner2016-04-053-3/+3
* | | Merge pull request #4786 from chef/tk_17Tyler Ball2016-04-052-4/+4
|\ \ \
| * | | use latest released test-kitchen in chef-acceptancetk_17Matt Wrock2016-04-042-4/+4
| |/ /
* | | Bump version of chef to 12.9.25 by Chef Versioner.v12.9.25Chef Versioner2016-04-053-3/+3
* | | Merge pull request #4799 from chef/adamedx/lamont-emailAdam Edwards2016-04-041-1/+1
|\ \ \ | |/ / |/| |
| * | Obvious fix: Update lamont@getchef.com email to lamont@chef.ioadamedx/lamont-emailAdam Edwards2016-04-041-1/+1
|/ /
* | Bump version of chef to 12.9.24 by Chef Versioner.v12.9.24Chef Versioner2016-04-043-3/+3
* | Merge pull request #4741 from chef/lcg/notify-scopesLamont Granquist2016-04-047-28/+500
|\ \
| * | halite is green, poise is not.Lamont Granquist2016-04-041-3/+3
| * | Make notifications recursive.lcg/notify-scopesLamont Granquist2016-04-046-25/+497
* | | Bump version of chef to 12.9.23 by Chef Versioner.v12.9.23Chef Versioner2016-04-043-3/+3
* | | Merge pull request #4790 from chef/revert_pinsTyler Ball2016-04-041-4/+0
|\ \ \
| * | | Revert https://github.com/chef/chef/pull/4781 because jmespath wasrevert_pinstyler-ball2016-04-041-4/+0
| |/ /
* | | Bump version of chef to 12.9.22 by Chef Versioner.v12.9.22Chef Versioner2016-04-043-3/+3
* | | Merge pull request #4787 from chef/salam/ssh-fixSalim Alam2016-04-041-1/+1
|\ \ \ | |/ / |/| |
| * | Convert timeout config to integersalam/ssh-fixSalim Alam2016-04-011-1/+1
|/ /
* | fix rubocopMatt Wrock2016-04-011-1/+1
* | Bump version of chef to 12.9.21 by Chef Versioner.v12.9.21Chef Versioner2016-04-013-3/+3
* | Merge pull request #4769 from chef/salam/doc-changesSalim Alam2016-04-011-122/+11
|\ \
| * | Update DOC_CHANGES for chef 12.9salam/doc-changesSalim Alam2016-03-301-122/+11
* | | Bump version of chef to 12.9.20 by Chef Versioner.v12.9.20Chef Versioner2016-04-013-3/+3
* | | Merge pull request #4778 from chef/new_tkMatt Wrock2016-04-012-5/+4
|\ \ \
| * | | use test-kitchen from master for acceptance testsnew_tkMatt Wrock2016-03-312-5/+4
* | | | Bump version of chef to 12.9.19 by Chef Versioner.v12.9.19Chef Versioner2016-04-013-3/+3
* | | | Merge pull request #4781 from chef/jk/no-json-pureJohn Keiser2016-04-011-0/+4
|\ \ \ \
| * | | | Don't bring in json_pure (jmespath 1.2 brings it in) because it breaks us.jk/no-json-pureJohn Keiser2016-04-011-0/+4
|/ / / /
* | | | Bump version of chef to 12.9.18 by Chef Versioner.v12.9.18Chef Versioner2016-04-013-3/+3
* | | | Merge pull request #4779 from chef/salam/ruby-21Lamont Granquist2016-03-316-29/+4
|\ \ \ \
| * | | | Revert "Spec break on Windows due to temp dir and short path names"Salim Alam2016-03-313-24/+2
| * | | | Revert "bump to ruby 2.2.4"salam/ruby-21Salim Alam2016-03-313-5/+2
|/ / / /
* | | | Bump version of chef to 12.9.17 by Chef Versioner.v12.9.17Chef Versioner2016-04-013-3/+3
* | | | Merge pull request #4775 from chef/cd/mount-remount-optionsBryan McLellan2016-03-315-48/+4
|\ \ \ \ | |/ / / |/| | |
| * | | Revert PR #1796.cd/mount-remount-optionsChris Doherty2016-03-315-48/+4
* | | | Bump version of chef to 12.9.16 by Chef Versioner.v12.9.16Chef Versioner2016-03-313-3/+3
* | | | Merge pull request #4776 from chef/adamedx/windows-ruby22-unit-tmpdirAdam Edwards2016-03-313-2/+24
|\ \ \ \ | |/ / / |/| | |
| * | | Spec break on Windows due to temp dir and short path namesadamedx/windows-ruby22-unit-tmpdirAdam Edwards2016-03-313-2/+24
|/ / /
* | | Bump version of chef to 12.9.15 by Chef Versioner.v12.9.15Chef Versioner2016-03-313-3/+3
* | | Merge pull request #4757 from tas50/better_mdLamont Granquist2016-03-312-70/+80
|\ \ \