summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* 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
|\ \
| * | Fix up specsjdm/simplify-lwrp1Jay Mundrawala2015-06-301-136/+138
| * | Simplify Chef::Resource::MyLWRP deprecationJay Mundrawala2015-06-301-49/+4
| * | Added spec for #3607Jay Mundrawala2015-06-301-0/+10
| * | Revert "Merge pull request #3603 from chef/jdm/lwrp-base"Jay Mundrawala2015-06-303-59/+61
* | | Merge pull request #3629 from chef/jdm/update-certsJay Mundrawala2015-07-011-56/+53
|\ \ \
| * | | Update certsjdm/update-certsJay Mundrawala2015-07-011-56/+53
|/ / /
* | | Merge pull request #3591 from DeWaRs1206/masterThom May2015-07-012-4/+5
|\ \ \ | |_|/ |/| |
| * | fix typoDeWaRs12062015-06-292-2/+0
| * | Merge branch 'master' of https://github.com/DeWaRs1206/chefDeWaRs12062015-06-290-0/+0
| |\ \
| | * | fix solo_spec according previous changeEmmanuel Iturbide2015-06-262-4/+6
| * | | fix solo_spec according previous changeEmmanuel Iturbide2015-06-292-4/+6
| |/ /
| * | Use Mixlib::Shellout instead of Chef::Mixin::CommandDeWaRs12062015-06-251-1/+2
* | | Merge pull request #3608 from chef/adamedx/powershell_script_spec_renameTyler Ball2015-06-303-0/+0
|\ \ \
| * | | Rename powershell spec files to match Ruby conventionsadamedx/powershell_script_spec_renameadamedx2015-06-273-0/+0
* | | | Update comment about how action could be a non-array. [ci skip]Noah Kantrowitz2015-06-301-1/+3
* | | | Merge pull request #3612 from chef/mcquin/chef-config/workstation-config-loaderClaire McQuin2015-06-306-175/+202
|\ \ \ \ | |_|_|/ |/| | |
| * | | Move workstation_config_loader into chef-configmcquin/chef-config/workstation-config-loaderClaire McQuin2015-06-296-175/+202