summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Creation of the new DataCollector reporteradamleff/data_collectorAdam Leff2016-06-0129-0/+2126
* Bump version of chef to 12.11.15 by Chef Versioner.v12.11.15Chef Versioner2016-05-314-8/+8
* Merge pull request #4979 from andrewjamesbrown/masterThom May2016-05-312-1/+22
|\
| * /etc/hosts needs to be non-atomic on dockerAndrew Brown2016-05-311-1/+1
| * Switch to node attributes for docker detectionAndrew Brown2016-05-302-3/+6
| * Style fixesAndrew Brown2016-05-302-4/+3
| * File atomic update default: false on docker filesAndrew Brown2016-05-303-14/+21
| * Avoid Errno::EBUSY on docker containersAndrew Brown2016-05-271-1/+13
* | Bump version of chef to 12.11.14 by Chef Versioner.v12.11.14Chef Versioner2016-05-314-8/+8
* | Merge pull request #4976 from chef/new_deps2Lamont Granquist2016-05-315-42/+62
|\ \
| * | add license to appbundlenew_deps2Matt Wrock2016-05-271-0/+3
| * | fix ffi gem depMatt Wrock2016-05-271-1/+1
| * | update dependenciesMatt Wrock2016-05-274-48/+65
| |/
* | Bump version of chef to 12.11.13 by Chef Versioner.v12.11.13Chef Versioner2016-05-314-8/+8
* | Merge pull request #4957 from chef/tm/solo_fixesThom May2016-05-312-1/+34
|\ \
| * | Ensure recipe-url works right in solotm/solo_fixesThom May2016-05-202-1/+34
* | | Bump version of chef to 12.11.12 by Chef Versioner.v12.11.12Chef Versioner2016-05-314-8/+8
* | | Merge pull request #4971 from chef/smurawski/rfc062-exit-status-chef-clientThom May2016-05-311-11/+9
|\ \ \
| * | | DOC_CHANGES for RFC 062 Exit Status behaviorsmurawski/rfc062-exit-status-chef-clientSteven Murawski2016-05-261-11/+9
| | |/ | |/|
* | | Bump version of chef to 12.11.11 by Chef Versioner.v12.11.11Chef Versioner2016-05-314-8/+8
* | | Merge pull request #4908 from nathwill/systemd-unit-try-actionsThom May2016-05-313-1/+84
|\ \ \
| * | | add more unit actionsNathan Williams2016-05-063-1/+84
* | | | Bump version of chef to 12.11.10 by Chef Versioner.v12.11.10Chef Versioner2016-05-314-8/+8
* | | | Merge pull request #4966 from crigor/ebuild-version-characterThom May2016-05-312-1/+7
|\ \ \ \
| * | | | Fix portage provider to support version with characterChristopher Rigor2016-05-242-1/+7
* | | | | Bump version of chef to 12.11.9 by Chef Versioner.v12.11.9Chef Versioner2016-05-314-9/+9
* | | | | Merge pull request #4977 from chef/choco_arMatt Wrock2016-05-313-30/+9
|\ \ \ \ \
| * | | | | fixes #4968 and only retrieves the latest version of packages from chocolateychoco_arMatt Wrock2016-05-273-30/+9
| | |_|/ / | |/| | |
* | | | | Bump version of chef to 12.11.8 by Chef Versioner.v12.11.8Chef Versioner2016-05-314-14/+14
* | | | | Merge pull request #4958 from chef/ssd/mailmap-updatesThom May2016-05-311-6/+59
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Update .mailmap with a few more entriesssd/mailmap-updatesSteven Danna2016-05-201-6/+59
* | | | | Bump version of chef to 12.11.7 by Chef Versioner.v12.11.7Chef Versioner2016-05-264-8/+8
* | | | | Merge pull request #4967 from chef/lcg/kitchen-tests3Lamont Granquist2016-05-265-16/+85
|\ \ \ \ \
| * | | | | add a few more distros to kitchen testinglcg/kitchen-tests3Lamont Granquist2016-05-255-16/+85
* | | | | | Bump version of chef to 12.11.6 by Chef Versioner.v12.11.6Chef Versioner2016-05-264-8/+8
* | | | | | Bump version of chef to 12.11.5 by Chef Versioner.v12.11.5Chef Versioner2016-05-264-8/+8
* | | | | | use a version ofm bundler that we haveMatt Wrock2016-05-251-1/+1
* | | | | | Merge pull request #4970 from chef/stupidMatt Wrock2016-05-251-1/+1
|\ \ \ \ \ \
| * | | | | | fix delete in bundle-platformMatt Wrock2016-05-251-1/+1
|/ / / / / /
* | | | | | Merge pull request #4965 from chef/bun_1_11Matt Wrock2016-05-253-15/+30
|\ \ \ \ \ \
| * | | | | | fix bundle locking on bundler 1.12 and enforce version we wantbun_1_11Matt Wrock2016-05-253-15/+30
* | | | | | | Bump version of chef to 12.11.4 by Chef Versioner.v12.11.4Chef Versioner2016-05-259-20/+19
* | | | | | | Merge pull request #4901 from chef/lcg/yum-readabilityLamont Granquist2016-05-255-959/+1049
|\ \ \ \ \ \ \
| * | | | | | | break yum provider out into fileslcg/yum-readabilityLamont Granquist2016-05-255-959/+1049
|/ / / / / / /
* | | | | | | Merge pull request #4960 from tas50/old_webhooksLamont Granquist2016-05-251-10/+0
|\ \ \ \ \ \ \
| * | | | | | | Remove old webhooks from TravisTim Smith2016-05-201-10/+0
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge pull request #4928 from chef/lcg/kitchen-tests3Lamont Granquist2016-05-2416-312/+412
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | / / / | |_|_|/ / / |/| | | | |
| * | | | | fixes from PR reviewLamont Granquist2016-05-241-1/+2
| * | | | | convert kitchen tests to docker + other fixesLamont Granquist2016-05-2416-312/+411
|/ / / / /
* | | | | Merge pull request #4961 from tas50/miscMatt Wrock2016-05-232-5/+1
|\ \ \ \ \ | |_|/ / / |/| | | |