Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | correct windows 10 major/minor version numbersversion | Matt Wrock | 2016-02-01 | 1 | -2/+2 |
| | |||||
* | Merge branch 'jk/policies-acls' | John Keiser | 2016-02-01 | 11 | -8/+131 |
|\ | |||||
| * | Remove branch pin from .travis.ymljk/policies-acls | John Keiser | 2016-02-01 | 2 | -2/+10 |
| | | |||||
| * | Don't pin chef-zero to a minor version, pin to major | John Keiser | 2016-02-01 | 1 | -1/+1 |
| | | |||||
| * | Fix /acls/data_bags local mode path | John Keiser | 2016-02-01 | 3 | -3/+7 |
| | | |||||
| * | Adjust tests for ACLs | John Keiser | 2016-02-01 | 5 | -2/+60 |
| | | |||||
| * | Add ACLs for policies, policy_groups and cookbook_artifacts | John Keiser | 2016-02-01 | 4 | -4/+57 |
|/ | |||||
* | Merge pull request #4494 from chef/salam/acceptance-fix | Salim Alam | 2016-01-29 | 1 | -1/+0 |
|\ | | | | | Remove local chef | ||||
| * | Remove local chefsalam/acceptance-fix | Salim Alam | 2016-01-29 | 1 | -1/+0 |
| | | |||||
* | | Merge pull request #4495 from chef/revert-4477-jdm/disable-poise | Noah Kantrowitz | 2016-01-29 | 1 | -0/+3 |
|\ \ | | | | | | | Revert "Remove poise from the test matrix" | ||||
| * | | Revert "Remove poise from the test matrix" | Noah Kantrowitz | 2016-01-29 | 1 | -0/+3 |
|/ / | |||||
* | | Allow all Chef Zero 4.x after 4.4fix-chef-zero-constraints | danielsdeleo | 2016-01-29 | 1 | -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-helper | Lamont Granquist | 2016-01-29 | 1 | -1/+2 |
|\ | | | | | add spec helper | ||||
| * | add spec helper | Lamont Granquist | 2016-01-29 | 1 | -1/+2 |
|/ | | | | tests won't run in isolation with it. | ||||
* | Merge pull request #4488 from chef/jdm/win-openssl-1.0.1r | Jay Mundrawala | 2016-01-29 | 1 | -1/+1 |
|\ | | | | | Update omnibus-software | ||||
| * | Update omnibus-softwarejdm/win-openssl-1.0.1r | Jay Mundrawala | 2016-01-28 | 1 | -1/+1 |
|/ | | | | This update brings in openssl 1.0.1r | ||||
* | Merge pull request #4487 from chef/btm/netfetcher_omnibus | Lamont Granquist | 2016-01-28 | 1 | -1/+1 |
|\ | | | | | Bump omnibus to try harder to see if netfetcher is breaking | ||||
| * | Bump omnibus to try harder to see if netfetcher is breaking | Bryan McLellan | 2016-01-28 | 1 | -1/+1 |
|/ | |||||
* | Merge pull request #4474 from chef/jk/bump-12.7.0 | John Keiser | 2016-01-28 | 5 | -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.0 | John Keiser | 2016-01-27 | 5 | -11/+9 |
| | | |||||
* | | Merge pull request #4484 from chef/jk/chef-zero-pin | Lamont Granquist | 2016-01-28 | 1 | -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 Keiser | 2016-01-28 | 1 | -1/+1 |
|/ / | |||||
* | | Merge pull request #4386 from chef/sersut/ec2-acceptance | Serdar Sutay | 2016-01-28 | 4 | -19/+34 |
|\ \ | | | | | | | Run acceptance tests in Jenkins | ||||
| * | | Make sure acceptance tests for chef can run in Jenkins.sersut/ec2-acceptance | Serdar Sutay | 2016-01-27 | 4 | -19/+34 |
| | | | |||||
* | | | Merge pull request #4479 from chef/fix-cookbook-artifact-normalization | Thom May | 2016-01-28 | 2 | -7/+1 |
|\ \ \ | |/ / |/| | | Remove incorrect cookbook artifact normalization | ||||
| * | | Remove incorrect cookbook artifact normalizationfix-cookbook-artifact-normalization | danielsdeleo | 2016-01-27 | 2 | -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-fix | Salim Alam | 2016-01-27 | 1 | -1/+1 |
|\ \ | | | | | | | Don't use public IP for AWS | ||||
| * | | Don't use public IP for AWS | Salim Alam | 2016-01-27 | 1 | -1/+1 |
| | | | |||||
* | | | Merge pull request #4477 from chef/jdm/disable-poise | Noah Kantrowitz | 2016-01-27 | 1 | -3/+0 |
|\ \ \ | | | | | | | | | Remove poise from the test matrix | ||||
| * | | | Remove poise from the test matrixjdm/disable-poise | Jay Mundrawala | 2016-01-27 | 1 | -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-maint | Lamont Granquist | 2016-01-27 | 1 | -0/+3 |
|\ \ \ | | | | | | | | | bundle install without maintenance and others | ||||
| * | | | bundle install without maintenance and others | Lamont Granquist | 2016-01-27 | 1 | -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/rubyinstall | Kartik Null Cating-Subramanian | 2016-01-27 | 7 | -56/+68 |
|\ \ \ | |/ / |/| | | Allow recent omnibus-software ruby version convention. | ||||
| * | | Leave chef-fips fetching yakyak for now | Kartik Null Cating-Subramanian | 2016-01-27 | 1 | -1/+2 |
| | | | |||||
| * | | Bump omnibus/omnibus-software. | Kartik Null Cating-Subramanian | 2016-01-27 | 1 | -2/+2 |
| | | | |||||
| * | | Don't fail CI build if tomlrb isn't available. | Kartik Null Cating-Subramanian | 2016-01-27 | 1 | -45/+51 |
| | | | |||||
| * | | Update chef and chef-fips to use the new ruby version defaults | Kartik Null Cating-Subramanian | 2016-01-27 | 2 | -7/+10 |
| | | | |||||
| * | | Add win2012r2 to kitchen.yml and update .gitignore. | Kartik Null Cating-Subramanian | 2016-01-27 | 3 | -2/+4 |
|/ / | |||||
* | | Merge pull request #4472 from chef/jdm/fix-fips-filter | Jay Mundrawala | 2016-01-27 | 2 | -2/+2 |
|\ \ | | | | | | | Fix inverted filter logic for not_fips rspec filter | ||||
| * | | Rename not_fips rspec filter to no_supported_under_fipsjdm/fix-fips-filter | Jay Mundrawala | 2016-01-27 | 2 | -2/+2 |
| | | | |||||
| * | | Fix inverted filter logic for not_fips rspec filter | Jay Mundrawala | 2016-01-27 | 1 | -1/+1 |
| | | | |||||
* | | | Fix config load expectations for windows | danielsdeleo | 2016-01-27 | 2 | -2/+2 |
| | | | |||||
* | | | Reorganize application tests to catch fatals | danielsdeleo | 2016-01-27 | 1 | -146/+158 |
| | | | |||||
* | | | Force config file setting to absolute path in chef-client | danielsdeleo | 2016-01-27 | 4 | -23/+69 |
| |/ |/| | |||||
* | | Merge branch 'jk/acceptance-spinup' | John Keiser | 2016-01-27 | 4 | -41/+106 |
|\ \ | |||||
| * | | Add more direct instructionsjk/acceptance-spinup | John Keiser | 2016-01-27 | 2 | -20/+26 |
| | | | |||||
| * | | Set ec2 as the default | John Keiser | 2016-01-27 | 2 | -2/+2 |
| | | | |||||
| * | | Update README | Salim Alam | 2016-01-27 | 1 | -0/+32 |
| | | | |||||
| * | | Updates for EC2 | Salim Alam | 2016-01-27 | 2 | -40/+67 |
|/ / | |||||
* | | Merge branch 'jk/nil-for-reals' | John Keiser | 2016-01-27 | 10 | -196/+297 |
|\ \ |