summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Implemented `knife user key list` and `knife client key list`.tc/key-listtylercloke2015-04-298-39/+644
| | | | Abstracted out a bunch of common tests with the key create code to reduce redundancy.
* Merge pull request #3301 from chef/revert-3296-disable-travis-containersJulian C. Dunn2015-04-291-0/+1
|\ | | | | Revert "Disable Travis CI container infrastructure due to broken IPv6 su...
| * Revert "Disable Travis CI container infrastructure due to broken IPv6 support"revert-3296-disable-travis-containersJulian C. Dunn2015-04-291-0/+1
|/
* Merge pull request #3296 from juliandunn/disable-travis-containersJulian C. Dunn2015-04-281-1/+0
|\ | | | | Disable Travis CI container infrastructure due to broken IPv6 support
| * Disable Travis CI container infrastructure due to broken IPv6 support:Julian C. Dunn2015-04-281-1/+0
|/ | | | https://github.com/travis-ci/travis-ci/issues/3302
* Merge pull request #3260 from chef/jdm/kitchen-appbundleJay Mundrawala2015-04-283-32/+28
|\ | | | | Update kitchen tests to use latest official test-kitchen
| * Use kitchen-appbundle-updaterjdm/kitchen-appbundleJay Mundrawala2015-04-283-32/+28
| |
* | Merge pull request #3271 from chef/tc/create-keyTyler Cloke2015-04-2810-8/+634
|\ \ | | | | | | Implement `knife user key create` and `knife client key create`
| * | Implemented `knife user key create` and `knife client key create`.tylercloke2015-04-289-6/+596
| | | | | | | | | | | | Implemented using a common service class that contains most of the actual functionality outside of parsing and inheriting Chef::Knife.
| * | Fixed bug in Chef::Key where create failed to return the full key.tylercloke2015-04-282-11/+37
| | | | | | | | | | | | | | | | | | | | | Code assumed POST to keys endpoint returned the key body like other parts of the API. Now, it simply generated the new key returned by create from the original key plus the private_key returned by the API if any. Specs also updated.
| * | Set chef_server_root config value to sane defaults.tylercloke2015-04-281-0/+10
|/ / | | | | | | If chef_server_url matches /\/organizations\/\S*$/ aka .../organizations/someorg, then strip /organizations/someorg and use that as the chef_server_root default. Otherwise, just use whatever chef_server_url is as the default.
* | Merge pull request #3279 from chef/lcg/fix-provider-resolver-api-breakThom May2015-04-273-1/+8
|\ \ | | | | | | Lcg/fix provider resolver api break
| * | typo fix in commentlcg/fix-provider-resolver-api-breakLamont Granquist2015-04-271-1/+1
| | |
| * | Fix API break in 12.3.0.rc.0Lamont Granquist2015-04-243-1/+8
| | | | | | | | | | | | | | | | | | | | | provides? on a provider was passed the full resource. provides? on a resource class cannot be passed the resource and must be passed the declared_type instead. i tried to make them the same, but that would change the API on the provider.
* | | Merge pull request #3280 from chef/sersut/3234Thom May2015-04-271-0/+1
|\ \ \ | | | | | | | | Configure serverspec correctly on windows.
| * | | Configure serverspec correctly on windows.sersut/3234Serdar Sutay2015-04-241-0/+1
| |/ /
* | | Merge pull request #3166 from chef/ssd/find-pythonThom May2015-04-252-2/+64
|\ \ \ | |/ / |/| | Use the same python interpreter as yum when possible
| * | Use the same python interpreter as yum when possiblessd/find-pythonSteven Danna2015-03-312-2/+64
| | | | | | | | | | | | | | | | | | | | | | | | We rely on a system python installation with the correct python libraries. To improve the chances that the python interpreter we call has the yum libary available, we use the same interpreter as yum uses. Fixes #3143
* | | Revert "Fix API break in 12.3.0.rc.0"Lamont Granquist2015-04-243-8/+1
| | | | | | | | | | | | This reverts commit 57cdbe124f63e47cab960e714572539d3979b90f.
* | | Fix API break in 12.3.0.rc.0Lamont Granquist2015-04-243-1/+8
| | | | | | | | | | | | | | | | | | | | | provides? on a provider was passed the full resource. provides? on a resource class cannot be passed the resource and must be passed the declared_type instead. i tried to make them the same, but that would change the API on the provider.
* | | Merge pull request #3268 from chef/tm/fix_maintainersThom May2015-04-241-43/+43
|\ \ \ | |_|/ |/| | Fix syntax nits in Maintainers file
| * | Fix syntax nits in Maintainers filetm/fix_maintainersThom May2015-04-231-43/+43
|/ /
* | Merge pull request #3254 from chef/jdm/12.4.0.dev12.4.0.dev.0Thom May2015-04-221-1/+1
|\ \ | | | | | | 12.4.0.dev.0 for master
| * | 12.4.0.dev.0 for masterjdm/12.4.0.devJay Mundrawala2015-04-211-1/+1
|/ /
* | Document changes from mergesThom May2015-04-211-0/+6
| |
* | Merge pull request #3214 from chef/tc/chef_key_objectTyler Cloke2015-04-203-0/+831
|\ \ | | | | | | Chef Key Object
| * | Implemented the Key object corrosponding to key rotation API endpoint.tc/chef_key_objecttylercloke2015-04-203-0/+831
|/ /
* | Update CHANGELOG for mergesBryan McLellan2015-04-201-3/+6
| |
* | Address review comments from @btmJulian C. Dunn2015-04-201-7/+3
| |
* | Address review comment ↵Julian C. Dunn2015-04-201-18/+0
| | | | | | | | https://github.com/chef/chef/pull/2877#discussion_r26357870
* | Several bugs found during testing:Julian C. Dunn2015-04-201-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | * Use -o option in curl to send the install.sh to a file. This way stderr/stdout can be reserved for errors like "curl: not found", ensuring it is captured. * On AIX, ksh was shell-substituting $ARGV[0] before script interpretation, so use a shift() trick to avoid the $ * If the chef-client binary doesn't exist at all, then avoid proceeding with the rest of should_update_chef() Tested on: AIX 7.1 + sudo, FreeBSD 10 + ca_root_nss + sudo
* | Gotta do something with that stderr we so carefully captured.Julian C. Dunn2015-04-201-0/+5
| |
* | Copy more robust routines from Omnitruck installer.Julian C. Dunn2015-04-201-31/+86
| | | | | | | | Put knife bootstrap proxy options back in the right place.
* | Rebase and resolve conflicts.Julian C. Dunn2015-04-201-22/+126
| |
* | Volunteer to assist as a FreeBSD maintainer.the Bunny Man2015-04-201-2/+9
| | | | | | | | I would be happy to help maintain chef's FreeBSD support.
* | Fix nil pointer for windows event loggerJay Mundrawala2015-04-202-5/+25
| | | | | | | | | | It is possible for the run to fail and no run_status to even have been set. This resolves issue #2996
* | Merge pull request #3247 from chef/btm/lower-json-nest-testsBryan McLellan2015-04-203-9/+9
|\ \ | | | | | | Reduce size of nested JSON test to 252 deep
| * | Reduce size of nested JSON test to 252 deepbtm/lower-json-nest-testsBryan McLellan2015-04-203-9/+9
|/ / | | | | | | | | | | I got confused running git on the tester with my last commit for #3101. This should clean it up.
* | Merge pull request #3238 from chef/jdm/solarisJay Mundrawala2015-04-171-1/+3
|\ \ | | | | | | Unit testify shell_spec
| * | Unit testify shell_specjdm/solarisJay Mundrawala2015-04-171-1/+3
|/ /
* | Merge pull request #3236 from chef/jdm/3102Jay Mundrawala2015-04-161-1/+1
|\ \ | | | | | | Fix failing specs
| * | Fix failing specsjdm/3102Jay Mundrawala2015-04-161-1/+1
|/ /
* | Merge pull request #3135 from tomhughes/searchThom May2015-04-162-1/+25
|\ \ | | | | | | Ensure that a search query makes progress
| * | Test that search queries make progressSteven Danna2015-03-251-0/+24
| | |
| * | Ensure that a search query makes progressTom Hughes2015-03-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | If a search doesn't return a full result then increment the start pointer by the number of rows returned, rather than assuming that it was equal to the row limit, and defaulting to zero. This should fix #3099
* | | Merge pull request #3102 from chef/btm/lower-json-nest-testsThom May2015-04-163-24/+9
|\ \ \ | | | | | | | | Reduce size of json nested entries
| * | | Reduce size of json nested entriesBryan McLellan2015-04-153-24/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On FreeBSD 10.1 i386 we're seeing rspec 3.2.2 raise SystemStackError if the expect line has a nested hash of 255 levels. I'm going to guess we don't even need this many. I lowered this test from 1000 to 300 arbitrarily some time ago. Fixes #3101
* | | | Merge pull request #3077 from chef/lcg/resource_priority_mapLamont Granquist2015-04-1520-86/+531
|\ \ \ \ | |/ / / |/| | | add resource_resolver and resource_priority_map
| * | | add md filesLamont Granquist2015-04-152-0/+27
| | | |
| * | | move where we dep inject the priority mapsLamont Granquist2015-04-152-6/+7
| | | | | | | | | | | | | | | | | | | | fixes the priority maps on chef-apply by wiring it up in the constructor of the client