summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* add pry to omnibuslcg/add-pryLamont Granquist2016-02-024-11/+12
* Merge pull request #4510 from chef/jdm/win-evt-fastJay Mundrawala2016-02-021-4/+9
|\
| * Make windows event log tests fasterJay Mundrawala2016-02-021-4/+9
* | Bump cheffish dep to 2.0jk/cheffish-2John Keiser2016-02-021-1/+1
|/
* Merge pull request #4509 from chef/jdm/all-ohai-systemJay Mundrawala2016-02-0212-42/+13
|\
| * Mark windows_service_spec as brokenJay Mundrawala2016-02-021-1/+2
| * Use documentation rspec formatterJay Mundrawala2016-02-021-1/+0
| * Use OHAI_SYSTEM where possibleJay Mundrawala2016-02-0210-40/+11
|/
* Merge pull request #4500 from chef/wix_usersMatt Wrock2016-02-012-0/+22
|\
| * explicitly specify user permissions during msi install of chef directoryMatt Wrock2016-02-012-0/+22
* | Merge pull request #4505 from chef/jdm/ohai-func-specJay Mundrawala2016-02-011-3/+1
|\ \
| * | Don't rerun ohai for ohai_spec when not neededjdm/ohai-func-specJay Mundrawala2016-02-011-3/+1
|/ /
* | Add --profile to all rspec rake tasksjk/rspec-profileJohn Keiser2016-02-011-2/+6
* | Add missing acl_entry backwards compatibility "require"John Keiser2016-02-012-0/+39
* | Merge pull request #4498 from chef/versionMatt Wrock2016-02-011-2/+2
|\ \
| * | correct windows 10 major/minor version numbersversionMatt Wrock2016-02-011-2/+2
* | | Simplify fix for property_type with defaultsjk/property-type-default-checkJohn Keiser2016-02-011-1/+1
* | | Fix defaults on property_typeJohn Keiser2016-02-012-2/+22
|/ /
* | 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 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"Noah Kantrowitz2016-01-291-0/+3
|/ /
* | Allow all Chef Zero 4.x after 4.4fix-chef-zero-constraintsdanielsdeleo2016-01-291-1/+1
|/
* Merge pull request #4489 from chef/lcg/add-spec-helperLamont Granquist2016-01-291-1/+2
|\
| * add spec helperLamont Granquist2016-01-291-1/+2
|/
* 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
|\ \ \ | |/ / |/| |