summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* whatever os you please, appveyorbtm/appveyor-2015Bryan McLellan2017-07-141-1/+1
* test getting doc formatting out of appveyorBryan McLellan2017-07-141-1/+1
* Use the previous VS 2015 image in appveyor instead of 2013Bryan McLellan2017-07-141-1/+1
* Bump version to 13.3.14 by Chef Expeditorv13.3.14Chef Expeditor2017-07-145-11/+10
* Merge pull request #6274 from chef/tm/fix_solaris_libtoolThom May2017-07-141-8/+8
|\
| * Fix solaris/x86 buildstm/fix_solaris_libtoolThom May2017-07-141-8/+8
|/
* Bump version to 13.3.13 by Chef Expeditorv13.3.13Chef Expeditor2017-07-145-10/+10
* Merge pull request #6268 from chef/schisamo/update-msi-signing-certThom May2017-07-141-2/+2
|\
| * Update SHA1 fingerprint for MSI signing certschisamo/update-msi-signing-certSeth Chisamore2017-07-131-2/+2
* | Bump version to 13.3.12 by Chef Expeditorv13.3.12Chef Expeditor2017-07-145-10/+11
* | Merge pull request #6272 from chef/tduffield/update-expeditor-configSeth Chisamore2017-07-141-13/+9
|\ \ | |/ |/|
| * Use new Expeditor config formattduffield/update-expeditor-configTom Duffield2017-07-131-13/+9
|/
* Bump version of chef to 13.3.11 by Chef Expeditor.v13.3.11Chef Expeditor2017-07-135-11/+10
* Merge pull request #6265 from MsysTechnologiesllc/change_os_for_appveyorLamont Granquist2017-07-131-1/+1
|\
| * change image appveyorMSys2017-07-111-1/+1
* | Merge pull request #6270 from chef/shain/update_omnibusThom May2017-07-131-14/+14
|\ \
| * | Update omnibus pinning to enable automated s3 omnibus cache populationshain/update_omnibusScott Hain2017-07-121-14/+14
|/ /
* | Bump version of chef to 13.3.10 by Chef Expeditor.v13.3.10Chef Expeditor2017-07-115-11/+10
* | Merge pull request #6266 from chef/lcg/fix-acceptance2Lamont Granquist2017-07-112-22/+38
|\ \
| * | fix some issues with sinatra appLamont Granquist2017-07-111-18/+34
| * | Fix acceptance try #2lcg/fix-acceptance2Lamont Granquist2017-07-101-4/+4
* | | Bump version of chef to 13.3.9 by Chef Expeditor.v13.3.9Chef Expeditor2017-07-115-10/+10
* | | Merge pull request #6102 from chef/tm/fix-policy-bootstrapThom May2017-07-112-0/+5
|\ \ \
| * | | If we don't have a run_list, don't send ittm/fix-policy-bootstrapThom May2017-07-052-0/+5
* | | | Bump version of chef to 13.3.8 by Chef Expeditor.v13.3.8Chef Expeditor2017-07-115-10/+10
* | | | Merge pull request #6230 from davide125/shellescapeThom May2017-07-114-75/+80
|\ \ \ \
| * | | | Ensure the service_name is always escaped when using systemdDavide Cavalca2017-07-104-75/+80
| | |/ / | |/| |
* | | | Bump version of chef to 13.3.7 by Chef Expeditor.v13.3.7Chef Expeditor2017-07-115-10/+10
* | | | Merge pull request #6264 from jonlives/masterThom May2017-07-111-0/+1
|\ \ \ \ | |/ / / |/| | |
| * | | Add Rubymine project files to .gitignore listJon Cowie2017-07-111-0/+1
|/ / /
* | | update comment about nokogiriLamont Granquist2017-07-101-2/+4
* | | Bump version of chef to 13.3.6 by Chef Expeditor.v13.3.6Chef Expeditor2017-07-105-10/+10
* | | Merge pull request #6262 from chef/lcg/bundle-updateLamont Granquist2017-07-101-4/+5
|\ \ \
| * | | Except I forgot to bundle update of courseLamont Granquist2017-07-101-12/+5
* | | | Bump version of chef to 13.3.5 by Chef Expeditor.v13.3.5Chef Expeditor2017-07-105-18/+10
* | | | Merge pull request #6261 from chef/lcg/move-nokogiri-to-omnibusLamont Granquist2017-07-103-1/+4
|\ \ \ \ | |/ / /
| * | | move nokogiri config to omnibusLamont Granquist2017-07-103-1/+4
|/ / /
* | | Bump version of chef to 13.3.4 by Chef Expeditor.v13.3.4Chef Expeditor2017-07-104-8/+8
* | | Merge pull request #6251 from chef/lcg/acceptance-fixLamont Granquist2017-07-101-0/+6
|\ \ \
| * | | acceptance tests are (ab)using our internal rubylcg/acceptance-fixLamont Granquist2017-07-031-0/+6
* | | | Merge pull request #6252 from chef/shain/enable_zypper_optionsLamont Granquist2017-07-102-5/+48
|\ \ \ \ | |_|_|/ |/| | |
| * | | Enable zypper package optionsshain/enable_zypper_optionsScott Hain2017-07-032-5/+48
| |/ /
* | | Bump version of chef to 13.3.3 by Chef Expeditor.v13.3.3Chef Expeditor2017-07-104-8/+8
* | | Merge pull request #6258 from chef/auto_deprecation_versionThom May2017-07-101-1/+3
|\ \ \
| * | | Auto increment the chef version for deprecationsauto_deprecation_versionTim Smith2017-07-061-1/+3
* | | | Merge pull request #6201 from chef/tm/no_api_versionThom May2017-07-103-2/+45
|\ \ \ \ | |/ / / |/| | |
| * | | Have a sensible default for old chef serverstm/no_api_versionThom May2017-07-053-2/+45
| |/ /
* | | Bump version of chef to 13.3.2 by Chef Expeditor.v13.3.2Chef Expeditor2017-07-065-10/+10
* | | Merge pull request #6255 from coderanger/nokogiri-is-backNoah Kantrowitz2017-07-062-2/+9
|\ \ \
| * | | Fix the lock file too.Noah Kantrowitz2017-07-061-0/+8