summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* fix trailing whitespacetm/trailing_whitespaceThom May2016-02-161-1/+1
|
* Merge pull request #4427 from juliandunn/remove-duplicate-shellcmddefLamont Granquist2016-02-162-17/+20
|\ | | | | Refactor test to remove duplicate definition of ShellCmdResult
| * Refactor test to remove duplicate definition of ShellCmdResultJulian C. Dunn2016-01-182-17/+20
| |
* | Merge pull request #4465 from artursitarski/change-shell-for-locked-userThom May2016-02-163-6/+9
|\ \ | | | | | | Change shell for locked user.
| * | Updated specartursitarski2016-02-022-4/+7
| | |
| * | More consistent wayartursitarski2016-01-271-4/+2
| | |
| * | Change shell for locked user.artursitarski2016-01-271-0/+2
| | |
* | | Merge pull request #4524 from PatrickWalker/feature/4154Steven Murawski2016-02-162-2/+2
|\ \ \ | | | | | | | | Update to Log Level when showing unencrypted databag
| * | | Update to Log Level when showing unencrypted databagPatrick Walker2016-02-032-2/+2
| | | |
* | | | Merge pull request #4581 from chef/tm/h4ck3rm1k3-master-masterThom May2016-02-161-1/+2
|\ \ \ \ | | | | | | | | | | bugfix #2865 check for validation_key
| * | | | bugfix #2865 check for validation_keytm/h4ck3rm1k3-master-masterJames Michael DuPont2016-02-161-1/+2
| | | | |
* | | | | Merge pull request #4579 from chef/cmluciano/fixhttperrorThom May2016-02-162-3/+15
|\ \ \ \ \ | | | | | | | | | | | | Make sure we have a valid object before calling close!
| * | | | | Add test to ensure Tempfile does the right thingcmluciano/fixhttperrorThom May2016-02-161-2/+14
| | | | | |
| * | | | | Make sure that we have a valid object before calling close!drag00n2016-02-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes [#2171](https://github.com/opscode/chef/issues/2171) when a tempfile cannot be created or proper filesystem permissions do not exist. This allows the proper exception to be thrown.
* | | | | | Merge pull request #4580 from chef/tm/cookbook_upload_name_argsThom May2016-02-161-2/+0
|\ \ \ \ \ \ | | | | | | | | | | | | | | remove bogus recalculation of cookbook upload failures
| * | | | | | remove bogus recalculation of cookbook upload failurestm/cookbook_upload_name_argsThom May2016-02-161-2/+0
| | |/ / / / | |/| | | | | | | | | | | | | | | | fixes #4350
* | | | | | Merge pull request #4583 from chef/tm/split_group_membersThom May2016-02-162-2/+7
|\ \ \ \ \ \ | | | | | | | | | | | | | | Split group members on commas
| * | | | | | test that splitting a string on commas DTRTtm/split_group_membersThom May2016-02-162-2/+7
| | | | | | |
| * | | | | | [chef/4294] group: split #members/#excluded_members on commasThom May2016-02-161-2/+2
| |/ / / / /
* | | | | | Merge pull request #4584 from chef/post_1272_releaseLamont Granquist2016-02-167-6/+8
|\ \ \ \ \ \ | | | | | | | | | | | | | | Post 12.7.2 release follow up items
| * | | | | | Use only the AWS environment variables to pass credentials, since thats what ↵post_1272_releasetyler-ball2016-02-161-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | kitchen-ec2 master wants
| * | | | | | Post 12.7.2 release follow up itemstyler-ball2016-02-166-4/+8
| |/ / / / /
* | | | | | Merge pull request #4585 from chef/pw/fix_verify_shLamont Granquist2016-02-162-7/+0
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Remove final cleanup from ci verify scripts
| * | | | | remove final cleanup from ci verify scripts to return proper exit codepw/fix_verify_shPatrick Wright2016-02-162-7/+0
|/ / / / /
* | | | | Merge branch 'petracvv-route_logic_fix'Thom May2016-02-161-1/+1
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Merge branch 'route_logic_fix' of https://github.com/petracvv/chef into ↵Thom May2016-02-161-1/+1
| |\ \ \ \ |/ / / / / | | | | | | | | | | petracvv-route_logic_fix
| * | | | Don't use routes with action :delete when writing configMihai Petracovici2015-08-251-1/+1
| | | | |
* | | | | Merge pull request #4548 from chef/tm/missed_migrationThom May2016-02-1530-40/+64
|\ \ \ \ \ | | | | | | | | | | | | tell knife's edit_data what the object is
| * | | | | Be way more explicit about how we're handling datatm/missed_migrationThom May2016-02-1530-40/+64
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This just codifies the behaviour we're actually using - that we're passing a json string and expecting a hash back. Also adds a deprecation warning to the use of Chef::JSONCompat.from_json
* | | | | Merge pull request #4573 from chef/lcg/bump-rubocopLamont Granquist2016-02-1247-258/+258
|\ \ \ \ \ | | | | | | | | | | | | pull rubocop 0.37.2 into chefstyle
| * | | | | fix alignmentlcg/bump-rubocopLamont Granquist2016-02-121-1/+1
| | | | | |
| * | | | | convert MultilineOperationIndentation style to "indented"Lamont Granquist2016-02-1236-86/+86
| | | | | | | | | | | | | | | | | | | | | | | | this looks nicer.
| * | | | | pull rubocop 0.37.2 into chefstyleLamont Granquist2016-02-1232-207/+207
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | this is from the same ruleset that we had, but the new code catches more conditions.
* | | | | | Merge pull request #4571 from chef/ad/fix_policyfile_zeroThom May2016-02-122-3/+7
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Fix policyfile_zero provisioner in 12.7
| * | | | | Fix policyfile testsad/fix_policyfile_zeroandy-dufour2016-02-121-2/+6
| | | | | |
| * | | | | Inflating the cookbook version object in policyfile compat modeandy-dufour2016-02-121-1/+1
| | | | | |
* | | | | | Merge pull request #4565 from chef/schisamo/disable-unitSeth Chisamore2016-02-122-2/+2
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Disable unit tests in later stages of CD pipeline
| * | | | | Disable unit tests in later stages of CD pipelineschisamo/disable-unitSeth Chisamore2016-02-112-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Travis/Appveyor already run the unit tests at the appropriate gate earlier in the build process. Running the tests on each platform we build a package for should give the same result and really just serves to slow the overall delivery process down.
* | | | | | Merge pull request #4570 from chef/no_webMatt Wrock2016-02-112-7/+14
|\ \ \ \ \ \ | | | | | | | | | | | | | | do not include source parameter when removing a chocolatey package and ensure source is used on all functional tests
| * | | | | | do not include source parameter when removing a chocolatey package and ↵no_webMatt Wrock2016-02-112-7/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | ensure source is used on all functional tests
* | | | | | | Merge pull request #4566 from chef/lcg/useless-run-commandLamont Granquist2016-02-111-3/+0
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | remove Chef::Mixin::Command use
| * | | | | | | remove Chef::Mixin::Command uselcg/useless-run-commandLamont Granquist2016-02-111-3/+0
| | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | we don't use run_command anywhere and this can apparently cause uninitialized constant issues when knife ssh is invoked via other knife commands (i.e. bootstrap) where apparently the transitive lazy deps aren't getting invoked correctly. there's another bug there, but we do not have any run_command statements in knife anymore so we should be able to drop this as a much easier fix. closes #4546
* | | | | | | Merge pull request #4564 from chef/ksubrama/testBryan McLellan2016-02-111-2/+6
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | Allow checking out pedump from a fork.
| * | | | | | Allow checking out pedump from a fork.Kartik Null Cating-Subramanian2016-02-111-2/+6
| |/ / / / /
* | | | | | Merge pull request #4563 from chef/salam/readme-updateSalim Alam2016-02-111-1/+47
|\ \ \ \ \ \ | | | | | | | | | | | | | | Update README to reflect more config options
| * | | | | | Update README to reflect more config optionsSalim Alam2016-02-111-1/+47
| |/ / / / /
* | | | | | Reenable learnchef acceptance testsjk/reenable-learnchefJohn Keiser2016-02-116-13/+27
| | | | | |
* | | | | | Merge pull request #4541 from chef/lcg/chefstyle-batchLamont Granquist2016-02-11175-510/+510
|\ \ \ \ \ \ | |/ / / / / |/| | | | | fix a batch of cops
| * | | | | autofixing auto-inserted delimiterslcg/chefstyle-batchLamont Granquist2016-02-09103-354/+354
| | | | | |
| * | | | | auto fixing some rubocopsLamont Granquist2016-02-09175-510/+510
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Style/NegatedWhile Style/ParenthesesAroundCondition Style/WhileUntilDo Style/WordArray Performance/ReverseEach Style/ColonMethodCall