summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* dscl specs should only run on macjdm/dscl-fixJay Mundrawala2015-03-102-1/+2
* Merge pull request #3050 from chef/jdm/osxJay Mundrawala2015-03-105-2/+21
|\
| * Dont run useradd_spec on osxjdm/osxJay Mundrawala2015-03-093-0/+16
| * Modify dscl_spec to runJay Mundrawala2015-03-091-1/+0
| * Sometimes plutil returns an invalid utf-8 string, which gets interpreted as a...Jay Mundrawala2015-03-091-1/+5
* | Merge pull request #3004 from chef/lcg/deploy-provider-nillableLamont Granquist2015-03-095-89/+146
|\ \
| * | remove unnecessary code editlcg/deploy-provider-nillableLamont Granquist2015-03-051-101/+98
| * | make deploy provider support nilLamont Granquist2015-03-055-187/+212
| * | add specs for nilling deploy parametersLamont Granquist2015-03-051-0/+35
* | | Merge pull request #3045 from chef/jdm/dev-versionJay Mundrawala2015-03-091-1/+1
|\ \ \ | |_|/ |/| |
| * | Use dev version in masterjdm/dev-versionJay Mundrawala2015-03-061-1/+1
|/ /
* | Merge pull request #3043 from chef/jdm/changelogJay Mundrawala2015-03-061-0/+4
|\ \
| * | Update changelog for 12.1.1Jay Mundrawala2015-03-061-0/+2
| * | Added #3019 to CHANGELOGJay Mundrawala2015-03-061-0/+2
|/ /
* | Merge pull request #3019 from ranjib/fix_searchJay Mundrawala2015-03-061-2/+1
|\ \
| * | fix data fetching when explicit attributes are passedRanjib Dey2015-03-031-2/+1
* | | Merge pull request #3017 from chef/jdm/changelogJay Mundrawala2015-03-061-1/+5
|\ \ \
| * | | Update CHANGELOG for #3011Jay Mundrawala2015-03-061-1/+3
| * | | Update CHANGELOG for #3013Jay Mundrawala2015-03-061-0/+2
| * | | Update changelog to reflect 12.1.0Jay Mundrawala2015-03-061-1/+1
|/ / /
* | | Merge pull request #3021 from chef/remove_thom_may_from_core_maintainersThom May2015-03-051-1/+0
|\ \ \
| * | | Remove @thommay as Core Maintainerremove_thom_may_from_core_maintainersnathenharvey2015-03-041-1/+0
| | |/ | |/|
* | | Merge pull request #2970 from chef/lcg/provider_resolverLamont Granquist2015-03-0429-120/+185
|\ \ \ | |/ / |/| |
| * | add CHANGELOG.mdlcg/provider_resolverLamont Granquist2015-03-041-0/+2
| * | rename 'hash' to 'provider_mapping'Lamont Granquist2015-03-041-5/+5
| * | add os to node stubLamont Granquist2015-03-041-3/+4
| * | provider_resolver migration from provider_mappingLamont Granquist2015-03-0427-117/+179
|/ /
* | Merge branch 'ryan/knife_ssh_on_error'Steven Danna2015-03-043-76/+13
|\ \
| * | CHANGELOG and DOC_CHANGES updates for #2941Steven Danna2015-03-042-76/+6
| * | Add --exit-on-error option to knife sshryan/knife_ssh_on_errorRyan Cragun2015-03-031-0/+7
* | | Merge pull request #2950 from jonlives/masterJon Cowie2015-03-041-1/+2
|\ \ \ | |_|/ |/| |
| * | Removing myself as RHEL maintainer per @btm's suggestion since I'll be LTJon Cowie2015-03-041-1/+0
| * | Revert "Propose myself as LT for core"Jon Cowie2015-03-041-2/+0
| * | Propose myself as LT for coreJon Cowie2015-03-041-0/+2
| * | Propose myself as LT for Enterprise LinuxJon Cowie2015-03-041-0/+2
|/ /
* | fix rspec test to use rspec best practicesKyleen MacGugan2015-03-031-1/+1
* | Merge pull request #3012 from chef/jdm/packageJay Mundrawala2015-03-031-0/+1
|\ \
| * | Adding Chef::Command::Mixin back into the package providerjdm/packageJay Mundrawala2015-03-031-0/+1
| |/
* | Merge pull request #3015 from chef/lcg/bundle-install-retryLamont Granquist2015-03-031-1/+1
|\ \
| * | make appveyor retry bundle installLamont Granquist2015-03-031-1/+1
* | | Merge pull request #3013 from jaymzh/multipackagefixPhil Dibowitz2015-03-031-1/+4
|\ \ \ | |/ / |/| |
| * | Allow people to pass in a 'source' to package rulesPhil Dibowitz2015-03-031-1/+4
* | | Merge pull request #3001 from chef/kyleen/audit-exclusionKyleen2015-03-032-0/+15
|\ \ \ | |_|/ |/| |
| * | Add /lib/chef/ to backtrace exclusion patterns for audit modekyleen/audit-exclusionKyleen MacGugan2015-03-032-0/+15
* | | Merge pull request #2949 from thommay/core_ltAdam Jacob2015-03-021-0/+1
|\ \ \
| * | | propose myself as a lieutenantThom May2015-02-191-0/+1
* | | | Merge pull request #2948 from thommay/maintainerize_meAdam Jacob2015-03-021-0/+2
|\ \ \ \
| * | | | Add myself as a maintainerThom May2015-02-191-0/+2
| |/ / /
* | | | Merge pull request #2999 from chef/pr-2988Jay Mundrawala2015-03-022-1/+16
|\ \ \ \
| * | | | Add parens to highlight precedencepr-2988Jay Mundrawala2015-03-021-1/+2