summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Rewrite nested json test to not use stackjdm/json-nested-testJay Mundrawala2015-07-171-3/+4
* Merge pull request #3680 from chef/tm/service_appveyor_onlyThom May2015-07-172-1/+2
|\
| * avoid windows service spec unless we're on appveyortm/service_appveyor_onlyThom May2015-07-172-1/+2
|/
* Update the URL in user agent string12.5.0.current.0danielsdeleo2015-07-161-1/+1
* Merge pull request #3242 from ranjib/chef_handlerRanjib Dey2015-07-166-1/+183
|\
| * Merge remote-tracking branch 'origin/master' into chef_handlerRanjib Dey2015-07-0692-1611/+3399
| |\
| * \ Merge remote-tracking branch 'origin/master' into chef_handlerRanjib Dey2015-06-2469-765/+4290
| |\ \
| * | | add name class attribute for user defined handlers. more readable invalid eve...Ranjib Dey2015-06-235-18/+70
| * | | fix typoRanjib Dey2015-06-181-1/+1
| * | | add spec for eventhandler dslRanjib Dey2015-06-131-0/+35
| * | | use Chef.run_context to register handler if setRanjib Dey2015-06-131-1/+9
| * | | Merge remote-tracking branch 'origin/master' into HEADRanjib Dey2015-06-12500-5875/+19315
| |\ \ \
| * | | | [RFC-039] chef handler dslRanjib Dey2015-04-185-1/+77
* | | | | Fix issue where DSL is not emitted if state_properties happens before propertyjk/state_attrsJohn Keiser2015-07-152-2/+18
* | | | | Merge pull request #3592 from chef/ryan/archThom May2015-07-142-1/+7
|\ \ \ \ \
| * | | | | Add Ryan Cragun to Archlinux maintainersryan/archRyan Cragun2015-07-012-1/+7
* | | | | | Merge pull request #3646 from chef/jdm/config-workstation-specJay Mundrawala2015-07-081-5/+10
|\ \ \ \ \ \
| * | | | | | Try fix for failing config testjdm/config-workstation-specJay Mundrawala2015-07-081-5/+10
|/ / / / / /
* | | | | | Merge pull request #3641 from grubernaut/issue_3640Noah Kantrowitz2015-07-072-2/+1
|\ \ \ \ \ \
| * | | | | | Decommission 12-stableJake Champlin2015-07-072-2/+1
|/ / / / / /
* | | | | | Update CHANGELOG for Chef 12.4.1Jay Mundrawala2015-07-061-3/+14
* | | | | | Merge pull request #3630 from chef/tc/fix-chef-userJay Mundrawala2015-07-0651-1477/+2009
|\ \ \ \ \ \
| * | | | | | Update changelog.tc/fix-chef-usertylercloke2015-07-061-0/+1
| * | | | | | Allow cookbooks_dir to use chef_rest instead of rest for now.tylercloke2015-07-062-10/+2
| * | | | | | Remove all the stupid json magic from Chef::ApiClientV1.tylercloke2015-07-066-111/+44
| * | | | | | Fix automated object generation from HTTP layer in ApiClient.tylercloke2015-07-061-0/+5
| * | | | | | Fixed old ApiClient tests.tylercloke2015-07-061-8/+3
| * | | | | | Set Chef::ApiClient to use API V0.tylercloke2015-07-061-2/+3
| * | | | | | Cleanup.tylercloke2015-07-062-1/+2
| * | | | | | Move ApiClient V1 supported code to Chef::ApiClientV1 and restore Chef::ApiCl...tylercloke2015-07-0619-352/+944
| * | | | | | Default Chef::ChefFS::...::ChefServerRootDir.rest to use API V0 and deprecate...tylercloke2015-07-062-3/+11
| * | | | | | Remove _rest from http methods.tylercloke2015-07-062-14/+14
| * | | | | | Move Chef::OscUser back to Chef::User namespace and new user code to Chef::Us...tylercloke2015-07-0631-1118/+1122
|/ / / / / /
* | | | | | Merge branch 'jk/3634'John Keiser2015-07-062-4/+34
|\ \ \ \ \ \
| * | | | | | Deprecate passing more than 1 argument to create a resourcejk/3634John Keiser2015-07-062-8/+18
| * | | | | | Don't accept multiple parameters in recipe DSL (just name)John Keiser2015-07-062-4/+24
|/ / / / / /
* | | | | | Merge branch 'jk/separate-priority-map'John Keiser2015-07-0634-517/+832
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | Memoize enabled_handlers so it is not recomputedjk/separate-priority-mapJohn Keiser2015-07-064-3/+39
| * | | | | Re-separate priority map and DSL handler map so that provides has veto power ...John Keiser2015-07-0634-517/+796
|/ / / / /
* | | | | Merge branch 'jk/property-state'John Keiser2015-07-0311-585/+1542
|\ \ \ \ \
| * | | | | Move property type derivation from "property_type" to "property"John Keiser2015-07-033-69/+42
| * | | | | Add Property.create and Resource.property_type for type system overridingJohn Keiser2015-07-036-59/+137
| * | | | | Bring set_or_return behavior back in line with what it used to beJohn Keiser2015-07-033-14/+26
| * | | | | Only stick non-frozen values to the resourceJohn Keiser2015-07-032-6/+57
| * | | | | Code review commentsJohn Keiser2015-07-031-6/+24
| * | | | | Make required name attributes workJohn Keiser2015-07-0310-578/+1403
|/ / / / /
* | | | | Make required name attributes workjk/required_name_attributeJohn Keiser2015-07-022-6/+6
* | | | | Merge pull request #3626 from chef/revert-3606-jdm/pin-ffiJay Mundrawala2015-07-021-1/+1
|\ \ \ \ \
| * | | | | Revert "FFI 1.9.9 is causing segfaults"revert-3606-jdm/pin-ffiJay Mundrawala2015-06-301-1/+1
* | | | | | Merge pull request #3623 from chef/jdm/simplify-lwrp1Jay Mundrawala2015-07-013-184/+153
|\ \ \ \ \ \