summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Run the chef service executable from the bin directoryjk/windows-service-stableJohn Keiser2015-09-231-2/+1
* Bump revision to 12.1.412.4.2John Keiser2015-09-212-1/+2
* Restrict to mixlib-shellout 2.1 (the version released with 12.4)John Keiser2015-09-181-1/+1
* Bump revision to 12.4.2jk/12.4.2John Keiser2015-09-183-10/+8
* Stop depending on master of ohaiJohn Keiser2015-09-181-5/+0
* Downgrade chef-zero to what was shippedJohn Keiser2015-09-181-1/+1
* Don't bring in ohai 8.6 (12.5 only)John Keiser2015-09-181-1/+1
* Merge pull request #3639 from chef/jdm/12.4.112.4.1Jay Mundrawala2015-07-07136-2341/+3704
|\
| * Chef 12.4.1 Changelog updatejdm/12.4.1Jay Mundrawala2015-07-061-2/+14
| * Bump versionJay Mundrawala2015-07-063-3/+3
| * Test 12.4-stable branch in travis and appveyorJay Mundrawala2015-07-062-0/+2
| * Merge pull request #3630 from chef/tc/fix-chef-userJay Mundrawala2015-07-0651-1477/+2026
| * Merge branch 'jk/3634'John Keiser2015-07-062-4/+34
| * Merge branch 'jk/separate-priority-map'John Keiser2015-07-0634-517/+832
| * Merge pull request #3623 from chef/jdm/simplify-lwrp1Jay Mundrawala2015-07-063-184/+153
| * Merge pull request #3629 from chef/jdm/update-certsJay Mundrawala2015-07-061-56/+53
| * Merge branch 'jk/call_provides_when_resolving'John Keiser2015-07-0624-372/+676
| * Merge branch '3618-run-list-mutation-issue'danielsdeleo2015-07-062-53/+121
| * Merge pull request #3603 from chef/jdm/lwrp-baseJay Mundrawala2015-07-063-61/+59
| * Merge pull request #3605 from coderanger/actionThom May2015-07-0625-49/+130
| * Merge pull request #3589 from chef/tm/fix_bashismsThom May2015-07-061-4/+4
| * Merge pull request #3599 from chef/jdm/3593Jay Mundrawala2015-07-062-1/+13
| * Merge pull request #3586 from chef/jdm/lwrp-fixJay Mundrawala2015-07-062-1/+27
|/
* Merge pull request #3580 from chef/ksubrama/release-notes12.4.0praj/12.4.0Jay Mundrawala2015-06-231-0/+38
|\
| * Update RELEASE_NOTES.mdKartik Null Cating-Subramanian2015-06-231-0/+38
|/
* Merge pull request #3578 from chef/jk/doc_changesjdm/12.4.0.rc.3Jay Mundrawala2015-06-231-10/+73
|\
| * Add some doc changes for 12.4.0John Keiser2015-06-231-10/+73
|/
* We're releasing chef 12.4.0Jay Mundrawala2015-06-233-3/+3
* Get rid of warning when defining an LWRPjk/remove_lwrp_warningJohn Keiser2015-06-232-20/+15
* Merge pull request #3564 from chef/mcquin/maintainer-requestThom May2015-06-232-0/+2
|\
| * Proposal to (re-)add myself as a core chef maintainer.mcquin/maintainer-requestClaire McQuin2015-06-222-0/+2
* | Merge pull request #3562 from coderanger/patch-2Jay Mundrawala2015-06-221-0/+4
|\ \ | |/ |/|
| * Use the right call.Noah Kantrowitz2015-06-191-1/+1
| * Re-add #priority.Noah Kantrowitz2015-06-191-0/+4
* | Merge pull request #3538 from chef/jdm/fix-audit-excepJay Mundrawala2015-06-222-25/+47
|\ \
| * | Fixup spec to only expect wrapped exception when audit mode is enabledjdm/fix-audit-excepJay Mundrawala2015-06-191-19/+35
| * | Exceptions for audits should only get wrapped if audit mode is enabledJay Mundrawala2015-06-161-6/+12
* | | Merge pull request #3555 from joemiller/joemiller-openbsd-ltJoshua Timberman2015-06-202-0/+14
|\ \ \ | |_|/ |/| |
| * | add Joe Miller as LT for OpenBSDjoe miller2015-06-182-0/+14
* | | Pointing kitchen-tests back at kitchen-ec2 master because I fixed my bad requ...tyler-ball2015-06-191-1/+1
* | | Merge pull request #3554 from ranjib/fix_depsThom May2015-06-192-0/+50
|\ \ \
| * | | add specs for resource_resolverRanjib Dey2015-06-181-0/+49
| * | | add missing require statementRanjib Dey2015-06-181-0/+1
* | | | Merge branch 'jk/multi-provider-warning'John Keiser2015-06-1821-140/+338
|\ \ \ \ | |_|/ / |/| | |
| * | | Use a slightly older revision of kitchen-ec2 (40d29858e8ee8ba14492ca54c881d96...jk/multi-provider-warningJohn Keiser2015-06-181-1/+1
| * | | Sort identical "provides" alphabetically (for backcompat)John Keiser2015-06-1820-139/+337
|/ / /
* | | Do not set resource_name outside of Chef::Resourcejk/chef-resource-name-onlyJohn Keiser2015-06-183-22/+20
|/ /
* | Merge pull request #3522 from ranjib/lt_deyThom May2015-06-182-2/+6
|\ \
| * | proposing myself as Ubuntu LTRanjib Dey2015-06-112-2/+6
| |/
* | Only automatically set resources that do class X < Chef::Resource,jk/3524John Keiser2015-06-1617-21/+38
View Lorry Controller Status