summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Run the chef service executable from the bin directoryjk/windows-service-stableJohn Keiser2015-09-231-2/+1
| | | | we are currently running from instead of guessing where it is
* 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
|\ | | | | 12.4.1
| * 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
| | | | | | | | | | | | | | Move Chef::OscUser back to Chef::User namespace and new user code to Chef::UserV1. Conflicts: CHANGELOG.md lib/chef/knife/user_edit.rb
| * 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
| | | | | | | | Simplify LWRP Deprecations Proposal 1
| * Merge pull request #3629 from chef/jdm/update-certsJay Mundrawala2015-07-061-56/+53
| | | | | | | | Update certs
| * 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
| | | | | | | | Fix ability to monkey match LWRP through Chef::Resource::MyLwrp
| * Merge pull request #3605 from coderanger/actionThom May2015-07-0625-49/+130
| | | | | | | | | | | | | | Rework Resource#action to match the 12.3 API. Conflicts: lib/chef/resource.rb spec/integration/recipes/resource_action_spec.rb
| * Merge pull request #3589 from chef/tm/fix_bashismsThom May2015-07-061-4/+4
| | | | | | | | Fix some errant bashisms
| * Merge pull request #3599 from chef/jdm/3593Jay Mundrawala2015-07-062-1/+13
| | | | | | | | Fix issue where blocks were not considered in priority mapping
| * Merge pull request #3586 from chef/jdm/lwrp-fixJay Mundrawala2015-07-062-1/+27
|/ | | | Fix to allow LW resources to be used with HW providers
* Merge pull request #3580 from chef/ksubrama/release-notes12.4.0praj/12.4.0Jay Mundrawala2015-06-231-0/+38
|\ | | | | Update RELEASE_NOTES.md
| * 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.0
| * 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.
| * 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
|\ \ | |/ |/| Re-add #priority.
| * Use the right call.Noah Kantrowitz2015-06-191-1/+1
| | | | | | set_priority_array is the right thing for this.
| * Re-add #priority.Noah Kantrowitz2015-06-191-0/+4
| | | | | | Possible fix for https://github.com/chef/chef/issues/3561.
* | Merge pull request #3538 from chef/jdm/fix-audit-excepJay Mundrawala2015-06-222-25/+47
|\ \ | | | | | | Exceptions for audits should only get wrapped if audit mode is enabled
| * | 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 OpenBSD
| * | 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 ↵tyler-ball2015-06-191-1/+1
| | | | | | | | | | | | require (was using the sdk v1 require when we no longer include the sdk v1 gem)
* | | Merge pull request #3554 from ranjib/fix_depsThom May2015-06-192-0/+50
|\ \ \ | | | | | | | | Add missing require statement in resource_resolver
| * | | 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 ↵jk/multi-provider-warningJohn Keiser2015-06-181-1/+1
| | | | | | | | | | | | | | | | (40d29858e8ee8ba14492ca54c881d961860b2ae7~1)
| * | | Sort identical "provides" alphabetically (for backcompat)John Keiser2015-06-1820-139/+337
|/ / / | | | | | | | | | - Warn when multiple providers try to provide the same thing
* | | 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 LT
| * | 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
| | | | | | | | not X = Class.new(Chef::Resource)
View Lorry Controller Status