summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Remove the extra commachoco_fixTim Smith2017-05-231-1/+1
* Only run the Chocolatey tests if Chocolatey is installedTim Smith2017-05-231-1/+1
* Bump version of chef to 13.1.23 by Chef Versioner.v13.1.23Chef Versioner2017-05-235-10/+10
* Merge pull request #6171 from chef/131_notesTim Smith2017-05-231-1/+1
|\
| * Fix link131_notesTim Smith2017-05-231-1/+1
* | Bump version of chef to 13.1.22 by Chef Versioner.v13.1.22Chef Versioner2017-05-235-74/+12
* | Merge pull request #6170 from chef/131_notesTim Smith2017-05-231-1/+13
|\ \ | |/
| * Add upstart change to the notesTim Smith2017-05-231-0/+4
| * Update release notes for 13.1Tim Smith2017-05-231-1/+9
* | Copy the 13.0 changelog over from the tm/release_notes branch.Noah Kantrowitz2017-05-231-0/+62
* | Note that the .36 hot fix happened.Noah Kantrowitz2017-05-231-2/+2
|/
* Bump version of chef to 13.1.21 by Chef Versioner.v13.1.21lita-devlita-acceptanceChef Versioner2017-05-205-13/+10
* Merge pull request #6167 from chef/lcg/bump-deps4Lamont Granquist2017-05-191-5/+7
|\
| * bump depsLamont Granquist2017-05-191-5/+7
|/
* Bump version of chef to 13.1.20 by Chef Versioner.v13.1.20Chef Versioner2017-05-165-10/+17
* Merge pull request #6154 from chef/tm/gem_pathThom May2017-05-163-17/+18
|\
| * Ensure that we check the embedded gem binary lasttm/gem_pathThom May2017-05-163-17/+18
* | Bump version of chef to 13.1.19 by Chef Versioner.v13.1.19Chef Versioner2017-05-165-10/+10
* | Merge pull request #6156 from shortdudey123/prefer_systemd_with_sysvinitThom May2017-05-162-11/+11
|\ \ | |/ |/|
| * Prefer Systemd with sysvinit script over Upstart for service providerGrant Ridder2017-05-152-11/+11
|/
* Bump version of chef to 13.1.18 by Chef Versioner.v13.1.18Chef Versioner2017-05-155-10/+10
* Merge pull request #6153 from chef/tm/disable_choco_harderThom May2017-05-151-2/+1
|\
| * Run choco tests just on 2012r2 for nowtm/disable_choco_harderThom May2017-05-151-2/+1
|/
* Bump version of chef to 13.1.17 by Chef Versioner.v13.1.17Chef Versioner2017-05-125-14/+11
* Merge pull request #6146 from chef/tm/disable_choco_testsThom May2017-05-121-0/+1
|\
| * Completely ignore the chocolatey teststm/disable_choco_testsThom May2017-05-121-0/+1
* | Bump version of chef to 13.1.16 by Chef Versioner.v13.1.16Chef Versioner2017-05-125-10/+17
* | Merge pull request #6144 from chef/tm/ohai_versionThom May2017-05-121-4/+4
|\ \ | |/ |/|
| * Bump ohai versiontm/ohai_versionThom May2017-05-121-4/+4
|/
* Bump version of chef to 13.1.15 by Chef Versioner.v13.1.15Chef Versioner2017-05-125-13/+10
* Merge pull request #6143 from MsysTechnologiesllc/nim/fixing_build_failuresThom May2017-05-124-8/+11
|\
| * mark test as pending with a useful messageThom May2017-05-121-2/+2
| * Added choco_include? filternimisha2017-05-114-10/+12
| * Fixing Build Failuresnimisha2017-05-111-0/+1
* | Bump version of chef to 13.1.14 by Chef Versioner.v13.1.14Chef Versioner2017-05-115-10/+17
* | Merge pull request #6100 from chef/smurawski/cab_compareThom May2017-05-112-15/+20
|\ \
| * | Remove extraneous `puts`smurawski/cab_compareSteven Murawski2017-05-081-1/+1
| * | return the resource rather than an empty assignment to a local variableSteven Murawski2017-05-081-1/+1
| * | Make the cab compare on name and version, not just name. The new servicing m...Steven Murawski2017-05-081-13/+18
* | | Bump version of chef to 13.1.13 by Chef Versioner.v13.1.13Chef Versioner2017-05-115-10/+10
* | | Merge pull request #6138 from chef/tm/acceptanceThom May2017-05-1111-159/+20
|\ \ \ | |_|/ |/| |
| * | Remove FIPS acceptance testingtm/acceptanceThom May2017-05-1110-139/+0
| * | Update gems to get a new plistThom May2017-05-101-20/+20
* | | Bump version of chef to 13.1.12 by Chef Versioner.v13.1.12Chef Versioner2017-05-105-10/+10
* | | Merge pull request #6140 from chef/lcg/get-lita-working-againLamont Granquist2017-05-103-14/+2
|\ \ \
| * | | remove bundle_install.shLamont Granquist2017-05-103-14/+2
|/ / /
* | | Merge pull request #6105 from Stromweld/patch-1Matt Wrock2017-05-102-4/+4
|\ \ \ | |/ / |/| |
| * | fixed test with @NimishaS suggestion.Corey Hemminger2017-05-030-0/+0
| |\ \
| | * | fixed test with @NimishaS suggestion. Signed-off-by: Corey Hemminger corey.he...Corey Hemminger2017-05-021-6/+2
| * | | fixed test with @NimishaS suggestion. Signed-off-by: Corey Hemminger corey.he...Corey Hemminger2017-05-031-6/+2
| |/ /