summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #5062 from chef/ksubrama/test1ksubrama/testKartik Null Cating-Subramanian2016-06-246-75/+78
|\ | | | | foo
| * fooKartik Null Cating-Subramanian2016-06-246-75/+78
|/
* Bump version of chef to 12.12.5 by Chef Versioner.v12.12.5Chef Versioner2016-06-244-8/+8
|
* Merge pull request #5058 from ↵Adam Leff2016-06-245-59/+133
|\ | | | | | | | | chef/adamleff/IPO-196/add-unprocessed-resources-to-data-collector Expand data_collector resource list to include all resources
| * Expand data_collector resource list to include all resourcesAdam Leff2016-06-245-59/+133
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Historically when a Chef run fails, the event handlers only report on resources that have been processed during the run. This change allows the Data Collector to report those resources in the resource collection that have not yet been processed so users can better ascertain how much of their run was completed, and specifically what resources were not processed as a result of the Chef failure. Instead of building up a list of resources as they are processed, this change instead creates a resource report for each resource+action in the resource collection and then modifies each of those reports once the resource is processed.
* | Merge pull request #5059 from chef/tm/correct_repo_pathThom May2016-06-242-0/+14
|\ \ | |/ |/| Ensure that chef-solo uses the expected repo dir
| * Ensure that chef-solo uses the expected repo dirtm/correct_repo_pathThom May2016-06-242-0/+14
|/ | | | | | | | | Solo has always defaulted to `/var/chef` but local-mode uses the user's home directory, so we need to ensure that we set the correct path before entering local-mode. Fixes: #5051 Signed-off-by: Thom May <thom@may.lt>
* Merge pull request #5048 from chef/fips_unitMatt Wrock2016-06-232-1/+20
|\ | | | | Turn off fips with an empty environment var
| * turn off fips with an empty environment varMatt Wrock2016-06-232-1/+20
| |
* | Merge pull request #5052 from chef/andrewelizondo/client-d-not-cliend-dBryan McLellan2016-06-231-1/+1
|\ \ | | | | | | correct typo in knife bootstrap context
| * | correct typo in knife bootstrap contextAndre Elizondo2016-06-231-1/+1
| |/ | | | | We want client_d, not cliend_d
* | Merge pull request #5050 from chef/uninstallMatt Wrock2016-06-232-14/+16
|\ \ | |/ |/| fixes some uninstall scenarios by calling uninstall string directly
| * fixes some uninstall scenarios by calling uninstall string directlyuninstallMatt Wrock2016-06-222-14/+16
|/
* Merge pull request #4896 from chef/tm/include_knife_supermarketThom May2016-06-2215-8/+294
|\ | | | | Deprecate knife-supermarket gem
| * Deprecate knife-supermarket gemtm/include_knife_supermarketThom May2016-05-0515-8/+294
| | | | | | | | | | | | | | Include all knife supermarket sub commands here, and allow all knife cookbook site commands to have a configurable supermarket URL. Signed-off-by: Thom May <thom@may.lt>
* | Merge pull request #5046 from chef/tm/sorted_gemsThom May2016-06-221-3/+9
|\ \ | | | | | | correctly select current gem version
| * | correctly select current gem versiontm/sorted_gemsThom May2016-06-221-3/+9
| | | | | | | | | | | | Signed-off-by: Thom May <thom@chef.io>
* | | Merge pull request #5037 from robdimarco/fix/issue-5027Steven Murawski2016-06-221-1/+1
|\ \ \ | | | | | | | | Fix for #5027 - Remove bad variable reference
| * | | Fix for #5027 - Remove bad variable referenceRob Di Marco2016-06-201-1/+1
| |/ / | | | | | | | | | | | | | | | | | | A previous change introduced what appears to be a copy/paste bug. A guard condition from the children method was used in the make_child_entry incorrectly. This removes the reference to the non-existent variable `seen`
* | | Merge pull request #4943 from chef/tm/knife_integration_testsThom May2016-06-2244-52/+2496
|\ \ \ | | | | | | | | Add a bunch of knife integration tests
| * | | Add most common knife commands to integration teststm/knife_integration_testsThom May2016-06-2244-52/+2496
|/ / / | | | | | | | | | Signed-off-by: Thom May <thom@chef.io>
* | | Bump version of chef to 12.12.4 by Chef Versioner.v12.12.4Chef Versioner2016-06-214-8/+8
| | |
* | | Merge pull request #5042 from chef/nokogiriMatt Wrock2016-06-2111-62/+61
|\ \ \ | | | | | | | | Update Nokogiri
| * | | update nokogiri and dependenciesMatt Wrock2016-06-2111-62/+61
| |/ /
* | | Merge pull request #5033 from chef/jk/crazy-version-bumpLamont Granquist2016-06-213-18/+45
|\ \ \ | |/ / |/| | Do not use bundle install to update Gemfile.lock after version bump
| * | Do not use bundle install to update Gemfile.lock after version bumpjk/crazy-version-bumpJohn Keiser2016-06-173-18/+45
| | |
* | | Bump version of chef to 12.12.3 by Chef Versioner.v12.12.3Chef Versioner2016-06-184-12/+12
| | |
* | | Merge pull request #5036 from chef/omni_updateMatt Wrock2016-06-171-2/+2
|\ \ \ | | | | | | | | bumping omnibus and omnibus-software
| * | | bumping omnibus and omnibus-softwareMatt Wrock2016-06-171-2/+2
| | | |
* | | | Merge pull request #5035 from chef/choco_fixMatt Wrock2016-06-174-0/+0
|\ \ \ \ | |/ / / |/| | | add an exit 0 to test choco packages so they dont break on 2008r2 with choco 0.9.10
| * | | add an exit 0 to test choco packages so they dont break on 2008r2 with choco ↵Matt Wrock2016-06-174-0/+0
| |/ / | | | | | | | | | 0.9.10
* | | Merge pull request #5031 from chef/skip_dscMatt Wrock2016-06-171-1/+1
|\ \ \ | |/ / |/| | skip and not pend failing dsc_script funcional test
| * | skip and not pend failing dsc_script funcional testskip_dscMatt Wrock2016-06-171-1/+1
|/ /
* | Merge pull request #5014 from chef/msys2Tyler Ball2016-06-1611-81/+86
|\ \ | | | | | | Updating omnibus dependencies to take advantage of new msys2 toolchain
| * | Reverting kitchen-tests updates to try and get them passing in Travismsys2tyler-ball2016-06-162-37/+35
| | |
| * | Manually adding ffi into the Gemfile.lock beacuse the rake:dependenciestyler-ball2016-06-161-0/+1
| | | | | | | | | | | | task is broken right now and corrupting the Gemfile.lock
| * | Updating dependencies againtyler-ball2016-06-164-41/+41
| | |
| * | Ignoring the nokogiri CVE until we update to 1.6.8tyler-ball2016-06-163-5/+6
| | |
| * | Making rake:dependencies worktyler-ball2016-06-158-57/+53
| | |
| * | Updating omnibus dependencies to take advantage of new msys2 toolchaintyler-ball2016-06-143-32/+41
| | |
* | | Merge pull request #5022 from coderanger/3694deprecationNoah Kantrowitz2016-06-162-9/+14
|\ \ \ | |/ / |/| | Convert the 3694 warning to a deprecation so it will be subject to the usual deprecation formatting (collected at the bottom, can be made an error, etc).
| * | Convert the 3694 warning to a deprecation so it will be subject to the usual ↵Noah Kantrowitz2016-06-102-9/+14
| | | | | | | | | | | | deprecation formatting (collected at the bottom, can be made an error, etc).
* | | Merge pull request #5025 from chef/praj/FLOW-334/sensitivePrajaktaPurohit2016-06-142-0/+17
|\ \ \ | | | | | | | | Remote resource should respect sensitive flag
| * | | Remote resource should respect sensitive flagpraj/FLOW-334/sensitivePrajakta Purohit2016-06-132-0/+17
|/ / /
* | | Merge pull request #5021 from chef/tc/deprecate-chef-cookbook-generateTyler Cloke2016-06-132-0/+5
|\ \ \ | |/ / |/| | Deprecate `knife cookbook create` in favor of `chef generate cookbook`.
| * | Deprecate `knife cookbook create` in favor of `chef generate cookbook`.tc/deprecate-chef-cookbook-generateTyler Cloke2016-06-102-0/+5
|/ /
* | Merge pull request #5019 from chef/adamleff/node-uuid-fixAdam Leff2016-06-102-9/+5
|\ \ | | | | | | bug fix: correctly write out data collector metadata file
| * | bug fix: correctly write out data collector metadata fileadamleff/node-uuid-fixAdam Leff2016-06-102-9/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | When we changed the messages from class instances to a module, the reading of metadata into an instance variable was removed and introduced a bug when updating metadata. This bug causes the metadata to be properly read from disk, updated, but then the metadata from disk is simply re-written to disk without the intended updates.
* | | Merge pull request #5000 from chef/praj/FLOW-927/s3cmdPrajaktaPurohit2016-06-102-22/+26
|\ \ \ | |/ / |/| | no more missing constants for LWRP class
| * | no more missing constants for LWRP classpraj/FLOW-927/s3cmdPrajakta Purohit2016-06-092-22/+26
| | |