summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* correct windows 10 major/minor version numbersversionMatt Wrock2016-02-011-2/+2
|
* Merge branch 'jk/policies-acls'John Keiser2016-02-0111-8/+131
|\
| * Remove branch pin from .travis.ymljk/policies-aclsJohn Keiser2016-02-012-2/+10
| |
| * Don't pin chef-zero to a minor version, pin to majorJohn Keiser2016-02-011-1/+1
| |
| * Fix /acls/data_bags local mode pathJohn Keiser2016-02-013-3/+7
| |
| * Adjust tests for ACLsJohn Keiser2016-02-015-2/+60
| |
| * Add ACLs for policies, policy_groups and cookbook_artifactsJohn Keiser2016-02-014-4/+57
|/
* Merge pull request #4494 from chef/salam/acceptance-fixSalim Alam2016-01-291-1/+0
|\ | | | | Remove local chef
| * Remove local chefsalam/acceptance-fixSalim Alam2016-01-291-1/+0
| |
* | Merge pull request #4495 from chef/revert-4477-jdm/disable-poiseNoah Kantrowitz2016-01-291-0/+3
|\ \ | | | | | | Revert "Remove poise from the test matrix"
| * | Revert "Remove poise from the test matrix"Noah Kantrowitz2016-01-291-0/+3
|/ /
* | Allow all Chef Zero 4.x after 4.4fix-chef-zero-constraintsdanielsdeleo2016-01-291-1/+1
|/ | | | | | | | | We require 4.4+ to support policyfile APIs with ChefFS and local mode, but we don't want to be pessimistic about minor versions, only major. It looks like the minor version pessimism was accidentally introduced here: https://github.com/chef/chef/commit/6e4d70826d8ee6977348bd071d0ce543686b89f6
* Merge pull request #4489 from chef/lcg/add-spec-helperLamont Granquist2016-01-291-1/+2
|\ | | | | add spec helper
| * add spec helperLamont Granquist2016-01-291-1/+2
|/ | | | tests won't run in isolation with it.
* Merge pull request #4488 from chef/jdm/win-openssl-1.0.1rJay Mundrawala2016-01-291-1/+1
|\ | | | | Update omnibus-software
| * Update omnibus-softwarejdm/win-openssl-1.0.1rJay Mundrawala2016-01-281-1/+1
|/ | | | This update brings in openssl 1.0.1r
* Merge pull request #4487 from chef/btm/netfetcher_omnibusLamont Granquist2016-01-281-1/+1
|\ | | | | Bump omnibus to try harder to see if netfetcher is breaking
| * 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 one VERSION file
| * 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)
| * | 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
|\ \ | | | | | | Run acceptance tests in Jenkins
| * | 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 normalization
| * | Remove incorrect cookbook artifact normalizationfix-cookbook-artifact-normalizationdanielsdeleo2016-01-272-7/+1
|/ / | | | | | | | | Pedant tests were leading us astray, we don't want to remove entries for empty cookbook segments
* | Merge pull request #4480 from chef/salam/aws-fixSalim Alam2016-01-271-1/+1
|\ \ | | | | | | Don't use public IP for AWS
| * | 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 matrix
| * | | Remove poise from the test matrixjdm/disable-poiseJay Mundrawala2016-01-271-3/+0
| |/ / | | | | | | | | | | | | | | | Poise is currently having it's tests refactored and thus not passing tests. We can revert this commit once that's all fixed up.
* | | Merge pull request #4476 from chef/lcg/travis-bundle-without-maintLamont Granquist2016-01-271-0/+3
|\ \ \ | | | | | | | | bundle install without maintenance and others
| * | | bundle install without maintenance and othersLamont Granquist2016-01-271-0/+3
|/ / / | | | | | | | | | | | | | | | if we don't test this here, then when the jenkins ci cluster runs it we may error in the Rakefile when it tries to require a gem which is not in the bundle that is installed there --without several gems.
* | | Merge pull request #4463 from chef/ksubrama/rubyinstallKartik Null Cating-Subramanian2016-01-277-56/+68
|\ \ \ | |/ / |/| | Allow recent omnibus-software ruby version convention.
| * | 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
|\ \ | | | | | | Fix inverted filter logic for not_fips rspec filter
| * | 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
|\ \