summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
* | Merge pull request #4488 from chef/jdm/win-openssl-1.0.1rJay Mundrawala2016-01-291-1/+1
|\ \
| * | Update omnibus-softwarejdm/win-openssl-1.0.1rJay Mundrawala2016-01-281-1/+1
|/ /
* | Merge pull request #4487 from chef/btm/netfetcher_omnibusLamont Granquist2016-01-281-1/+1
|\ \ | |/ |/|
| * Bump omnibus to try harder to see if netfetcher is breakingBryan McLellan2016-01-281-1/+1
|/
* Merge pull request #4474 from chef/jk/bump-12.7.0John Keiser2016-01-285-11/+9
|\
| * Bump version to 12.7.0, and make "rake version" use just the one VERSION filejk/bump-12.7.0John Keiser2016-01-275-11/+9
* | Merge pull request #4484 from chef/jk/chef-zero-pinLamont Granquist2016-01-281-1/+1
|\ \
| * | Pin chef-zero to a pre-merge SHA (will unpin shortly)John Keiser2016-01-281-1/+1
|/ /
* | Merge pull request #4386 from chef/sersut/ec2-acceptanceSerdar Sutay2016-01-284-19/+34
|\ \
| * | Make sure acceptance tests for chef can run in Jenkins.sersut/ec2-acceptanceSerdar Sutay2016-01-274-19/+34
* | | Merge pull request #4479 from chef/fix-cookbook-artifact-normalizationThom May2016-01-282-7/+1
|\ \ \ | |/ / |/| |
| * | Remove incorrect cookbook artifact normalizationfix-cookbook-artifact-normalizationdanielsdeleo2016-01-272-7/+1
|/ /
* | Merge pull request #4480 from chef/salam/aws-fixSalim Alam2016-01-271-1/+1
|\ \
| * | Don't use public IP for AWSSalim Alam2016-01-271-1/+1
* | | Merge pull request #4477 from chef/jdm/disable-poiseNoah Kantrowitz2016-01-271-3/+0
|\ \ \
| * | | Remove poise from the test matrixjdm/disable-poiseJay Mundrawala2016-01-271-3/+0
| |/ /
* | | Merge pull request #4476 from chef/lcg/travis-bundle-without-maintLamont Granquist2016-01-271-0/+3
|\ \ \
| * | | bundle install without maintenance and othersLamont Granquist2016-01-271-0/+3
|/ / /
* | | Merge pull request #4463 from chef/ksubrama/rubyinstallKartik Null Cating-Subramanian2016-01-277-56/+68
|\ \ \ | |/ / |/| |
| * | Leave chef-fips fetching yakyak for nowKartik Null Cating-Subramanian2016-01-271-1/+2
| * | Bump omnibus/omnibus-software.Kartik Null Cating-Subramanian2016-01-271-2/+2
| * | Don't fail CI build if tomlrb isn't available.Kartik Null Cating-Subramanian2016-01-271-45/+51
| * | Update chef and chef-fips to use the new ruby version defaultsKartik Null Cating-Subramanian2016-01-272-7/+10
| * | Add win2012r2 to kitchen.yml and update .gitignore.Kartik Null Cating-Subramanian2016-01-273-2/+4
|/ /
* | Merge pull request #4472 from chef/jdm/fix-fips-filterJay Mundrawala2016-01-272-2/+2
|\ \
| * | Rename not_fips rspec filter to no_supported_under_fipsjdm/fix-fips-filterJay Mundrawala2016-01-272-2/+2
| * | Fix inverted filter logic for not_fips rspec filterJay Mundrawala2016-01-271-1/+1
* | | Fix config load expectations for windowsdanielsdeleo2016-01-272-2/+2
* | | Reorganize application tests to catch fatalsdanielsdeleo2016-01-271-146/+158
* | | Force config file setting to absolute path in chef-clientdanielsdeleo2016-01-274-23/+69
| |/ |/|
* | Merge branch 'jk/acceptance-spinup'John Keiser2016-01-274-41/+106
|\ \
| * | Add more direct instructionsjk/acceptance-spinupJohn Keiser2016-01-272-20/+26
| * | Set ec2 as the defaultJohn Keiser2016-01-272-2/+2
| * | Update READMESalim Alam2016-01-271-0/+32
| * | Updates for EC2Salim Alam2016-01-272-40/+67
|/ /
* | Merge branch 'jk/nil-for-reals'John Keiser2016-01-2710-196/+297
|\ \
| * | Make chef_gem.gem_binary use correct default valuejk/nil-for-realsJohn Keiser2016-01-271-1/+1
| * | Fix nil with properties:John Keiser2016-01-2710-196/+297
|/ /
* | Merge pull request #4409 from chef/lcg/suppress-reporter-failuresLamont Granquist2016-01-273-3/+29
|\ \ | |/ |/|
| * fix typo in commentLamont Granquist2016-01-271-1/+1
| * suppress reporter failures by using validate_utf8=falselcg/suppress-reporter-failuresLamont Granquist2016-01-263-3/+29
* | Merge pull request #4470 from chef/jdm/fix2-pipelineJay Mundrawala2016-01-271-1/+1
|\ \
| * | Fix sh spacing issuesJay Mundrawala2016-01-271-1/+1
|/ /
* | Merge pull request #4434 from chef/lcg/better-eof-errorsLamont Granquist2016-01-277-10/+77
|\ \
| * | explicit specs for EOFErrorslcg/better-eof-errorsLamont Granquist2016-01-262-6/+29
| * | adds EOFError message to handlersLamont Granquist2016-01-196-7/+51
* | | Merge pull request #4466 from chef/jdm/fix-pipelineThom May2016-01-271-3/+4
|\ \ \
| * | | Fix bug in sh script that runs test in jenkinsjdm/fix-pipelineJay Mundrawala2016-01-261-3/+4
* | | | Merge pull request #4422 from chef/tm/apt_updateThom May2016-01-276-0/+264
|\ \ \ \
| * | | | fix style nittm/apt_updateThom May2016-01-221-1/+1