summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Bump version to 12.1.1jdm/12.1.1Jay Mundrawala2015-03-061-1/+1
* Clear out DOC_CHANGES and RELEASE_NOTESJay Mundrawala2015-03-062-230/+1
* Pull in changelog from masterJay Mundrawala2015-03-061-0/+16
* Merge pull request #3019 from ranjib/fix_searchJay Mundrawala2015-03-061-2/+1
* Merge pull request #3012 from chef/jdm/packageJay Mundrawala2015-03-061-0/+1
* Merge pull request #3013 from jaymzh/multipackagefixPhil Dibowitz2015-03-061-1/+4
* Merge pull request #3002 from chef/jdm/12-stable-cherry12.1.0Jay Mundrawala2015-03-0226-76/+141
|\
| * Bump version 12.1.0jdm/12-stable-cherryJay Mundrawala2015-03-021-1/+1
| * Merge pull request #2999 from chef/pr-2988Jay Mundrawala2015-03-022-1/+16
| * Merge pull request #2997 from chef/jdm/yum-fixJay Mundrawala2015-03-022-20/+20
| * Merge pull request #2995 from chef/jdm/win-service-doc-changesJay Mundrawala2015-03-023-0/+12
| * Merge pull request #2990 from chef/tball/mingw-shenanigansJay Mundrawala2015-03-021-4/+4
| * Merge pull request #2992 from chef/jdm/osx-fixJay Mundrawala2015-03-022-11/+18
| * Merge pull request #2986 from chef/jdm/win-serviceJay Mundrawala2015-03-023-12/+41
| * Send search count to stderrdanielsdeleo2015-03-021-2/+2
| * Merge pull request #2983 from chef/tball/include_shelloutTyler Ball2015-03-021-0/+1
| * Merge pull request #2954 from chef/lcg/lint-fixesLamont Granquist2015-03-029-24/+24
| * Merge pull request #2964 from chef/jtimberman-osx-ltNathen Harvey2015-03-021-1/+2
|/
* Merge pull request #2958 from chef/jdm/merge-into-12-stable12.1.0.rc.0Jay Mundrawala2015-02-19691-11686/+26279
|\
| * Merge remote-tracking branch 'origin/master' into HEADjdm/merge-into-12-stableJay Mundrawala2015-02-19691-11686/+26279
| |\ |/ /
| * Merge pull request #2952 from chef/jdm/chef-12.1Jay Mundrawala2015-02-193-458/+4
| |\
| | * Remove Chef 12 release notesJay Mundrawala2015-02-191-456/+0
| | * Update Changelog for Chef 12.1.0Jay Mundrawala2015-02-191-1/+3
| | * Chef 12.1.0.rc.0Jay Mundrawala2015-02-191-1/+1
| |/
| * Merge pull request #2946 from chef/jdm/group-spec-fixKartik Null Cating-Subramanian2015-02-191-0/+3
| |\
| | * Group spec needs to respond to shell_outjdm/group-spec-fixJay Mundrawala2015-02-191-0/+3
| * | Merge pull request #2942 from chef/lcg/dpkg-regressionLamont Granquist2015-02-192-0/+3
| |\ \ | | |/ | |/|
| | * fix dpkg regressionLamont Granquist2015-02-192-0/+3
| |/
| * Merge pull request #2924 from chef/btm/popen_shellout_rebaseJay Mundrawala2015-02-1930-314/+288
| |\
| | * Make tests pass on Windowsbtm/popen_shellout_rebaseJay Mundrawala2015-02-181-1/+1
| | * Fix unit specs for PR #2934Jay Mundrawala2015-02-181-3/+3
| | * Merge pull request #2934 from ClogenyTechnologies/kd/rpm-fixLamont Granquist2015-02-181-1/+1
| | |\
| | | * dont raise exceptions in load_current_resource when checking current statuskaustubh-d2015-02-181-1/+1
| | |/
| | * fix aix related providers to replace popen4 with mixlib shell_outkaustubh-d2015-02-1729-309/+283
| * | Merge pull request #2940 from chef/lcg/unreachable-codeLamont Granquist2015-02-1810-64/+64
| |\ \
| | * | fix Lint/BlockAlignmentlcg/unreachable-codeLamont Granquist2015-02-182-5/+5
| | * | whitespaces fixesLamont Granquist2015-02-183-52/+52
| | * | fix Lint/AmbiguousRegexpLiteralLamont Granquist2015-02-181-2/+2
| | * | fix Lint/LiteralInConditionLamont Granquist2015-02-182-2/+2
| | * | fix Lint/Loop styleLamont Granquist2015-02-181-2/+3
| | * | remove unreachable codeLamont Granquist2015-02-181-1/+0
| |/ /
| * | Merge pull request #2933 from andrewelizondo/fix-typo-in-msi-providerLamont Granquist2015-02-182-1/+3
| |\ \
| | * | update changelogandrewelizondo2015-02-171-0/+2
| | * | fix typo in msi providerandrewelizondo2015-02-171-1/+1
| |/ /
| * | Merge pull request #2922 from chef/lcg/fix-multipackageLamont Granquist2015-02-172-90/+104
| |\ \
| | * | Added spec for #2914lcg/fix-multipackageJay Mundrawala2015-02-171-0/+15
| | * | fix virtual package logic in check_package_stateLamont Granquist2015-02-172-89/+79
| | * | use scalar pkg not array packageLamont Granquist2015-02-171-1/+1
| | * | convert is_virtual_package to hashLamont Granquist2015-02-172-5/+14
| |/ /
| * | Merge pull request #2928 from chef/lcg/validatorless-docsLamont Granquist2015-02-173-0/+28
| |\ \
View Lorry Controller Status