summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Use platform_specific_path in chef shelljdmundrawala/path-sep-refactorJay Mundrawala2014-11-141-10/+2
|
* Merge pull request #2395 from opscode/jdmundrawala/chef-shell-windowsJay Mundrawala2014-11-111-2/+10
|\ | | | | chef-shell checks platform when looking for client.rb and solo.rb.
| * chef-shell checks platform when looking for client.rb and solo.rb.jdmundrawala/chef-shell-windowsJay Mundrawala2014-11-101-2/+10
| | | | | | | | | | | | https://github.com/opscode/chef/issues/2380 pointed out that on windows, -c is required with the -z flag because it would assume nix and look in /etc/chef for client.rb
* | Merge pull request #2394 from opscode/jdmundrawala/win-cookbook-ns-colJay Mundrawala2014-11-101-6/+5
|\ \ | |/ |/| Windows event logger no longer imports into the global namespace.
| * Windows event logger no longer imports into the global namespace.Jay Mundrawala2014-11-101-6/+5
|/ | | | | | This was causing problems with the windows cookbook trying to redefine one of those constants. This patch solves https://github.com/opscode-cookbooks/windows/issues/141
* Merge pull request #2336 from opscode/lcg/12-systemd-fixesjdm/fooSerdar Sutay2014-11-0822-286/+566
|\ | | | | fix systemd for Ubuntu 14.10
| * Update md files.Serdar Sutay2014-11-081-1/+7
| |
| * rspec 3 fixeslcg/12-systemd-fixesLamont Granquist2014-11-081-4/+4
| |
| * spec fixesLamont Granquist2014-11-083-6/+36
| |
| * syntax fixes for grepping outputLamont Granquist2014-11-081-2/+6
| |
| * polishing provider_resolverLamont Granquist2014-11-0816-72/+216
| | | | | | | | | | | | | | | | * makes provides? more correct for linux services * makes supports? more targetted for linux services * remove provider_resolver from the run_context * fix timestamped deploy spec * add more specs
| * add some more debug output and commentsLamont Granquist2014-11-081-2/+7
| |
| * systemctl path fixes, rspec modernization, etcLamont Granquist2014-11-082-188/+225
| | | | | | | | | | | | | | - systemd provider uses `which` mixin to determine systemctl path - let-ification of spec tests for system provider - fix some stubbing and mocking of current_resource that was confusing and useless
| * extract which to a mixin, use for systemctlLamont Granquist2014-11-083-13/+51
| |
| * correct list-unit-files + refactoringLamont Granquist2014-11-081-3/+6
| |
| * fix systemd for Ubuntu 14.10Lamont Granquist2014-11-081-3/+16
| | | | | | | | | | | | | | | | | | | | | | It has systemctl installed on the system but does not have systemd wired up as init by default and trying to use systemctl throws exceptions that breaks everything. Also add a big banner warning because I'm sure someone is going to think that the shortest past to fixing priority bugs is hacking up what gets reported from these modules, rather than fixing the bugs in the downstream logic.
* | Merge pull request #2387 from opscode/sersut/revert-attr-nil-overrideSerdar Sutay2014-11-082-20/+3
|\ \ | | | | | | Revert "CHEF-4101: DeepMerge - support overwriting hash values with nil"
| * | Revert "CHEF-4101: DeepMerge - support overwriting hash values with nil"sersut/revert-attr-nil-overrideSerdar Sutay2014-11-082-20/+3
|/ / | | | | | | | | | | | | This reverts commit 972bc2f61685979e5b76f5481e3b1af2bd010d0e. Conflicts: spec/unit/mixin/deep_merge_spec.rb
* | Merge pull request #2097 from opscode/lcg/chef-12-attrLamont Granquist2014-11-087-50/+546
|\ \ | |/ |/| Lcg/chef 12 attr
| * add md files for chef-12 attr syntaxLamont Granquist2014-11-082-0/+9
| |
| * fix rspec truthy thingsLamont Granquist2014-11-081-6/+6
| |
| * fix autovivificationLamont Granquist2014-11-083-33/+88
| |
| * chef-12 attribute changesLamont Granquist2014-11-085-44/+476
|/ | | | | | - adding rm, rm_default, rm_normal, rm_override APIs - adding default!, normal! and override! APIs - changing force_default! and force_override! APIs
* Merge pull request #2370 from opscode/ryan/follow_symlinksSerdar Sutay2014-11-073-1/+25
|\ | | | | Make client.pem being a symlink a configurable option
| * Fix rspec 3 specs.ryan/follow_symlinksSerdar Sutay2014-11-071-2/+2
| |
| * Add spec for making client.pem a symlink a config optionRyan Cragun2014-11-071-0/+16
| |
| * Make client.pem being a symlink a configurable optionRyan Cragun2014-11-072-1/+9
| |
* | Add CLA_ARCHIVE -- List of CLAs from pre-supermarket timesdanielsdeleo2014-11-071-0/+2510
|/
* Merge pull request #2368 from opscode/sersut/knife-cloud-bootstrap-optionsSerdar Sutay2014-11-073-9/+36
|\ | | | | Knife cloud plugins bootstrap problem with Chef 12 when using custom templates.
| * Rspec 3 compat.Serdar Sutay2014-11-071-3/+3
| |
| * Make sure that :distro is evaluated later than :bootstrap_template and ↵Serdar Sutay2014-11-073-9/+36
|/ | | | :template_file in order for knife cloud plugins to work corectly with Chef 12.
* Merge pull request #2324 from opscode/mcquin/rspec-3Claire McQuin2014-11-07321-7488/+7505
|\ | | | | Update to RSpec 3
| * Don't populate X-Chef-Version.mcquin/rspec-3Claire McQuin2014-11-071-0/+7
| |
| * Merge branch 'master' into mcquin/rspec-3Claire McQuin2014-11-0760-245/+702
| |\ | |/ |/|
* | Bring in cheffish and provisioning resources if they are installedchef-provisioningJohn Keiser2014-11-051-0/+7
| |
* | Change the integration test server port from 8889 to 8890 so the test can ↵Chris Doherty2014-11-051-2/+2
| | | | | | | | | | | | succeed when being run from a Chef recipe (specifically chef-zero in test-kitchen).
* | Merge pull request #2273 from opscode/jdmundrawala/gemspecJay Mundrawala2014-11-042-4/+3
|\ \ | | | | | | Only include chef-service-manager on windows
| * | Only include chef-service-manager on windowsjdmundrawala/gemspecJay Mundrawala2014-10-212-4/+3
| | |
* | | update html pages for chef-client 12jamescott2014-11-0322-123/+348
| | |
* | | update man pages for chef-client 12jamescott2014-11-0334-116/+342
| | |
| | * Merge pull request #2346 from opscode/tball/rspec3-fixClaire McQuin2014-11-033-17/+18
| | |\ | | | | | | | | Getting pedant running with rspec 3
| | | * Updating from comments - simplifying codetball/rspec3-fixtyler-ball2014-11-032-16/+6
| | | |
| | | * Removing bad check-intyler-ball2014-11-031-1/+0
| | | |
| | | * Updating pedant to run correctly and send output to STDOUTtyler-ball2014-11-032-8/+24
| | | |
| | | * Merge 83965110f4803416ffa535080b129f6546c746e4 into ↵Claire McQuin2014-10-31318-7486/+7481
| | | |\ | |_|/ / |/| | | | | | | 2f942406d9bb64335586cbca982dfbe9d36c0a74
| | | * shell_out didn't pick up entire commandClaire McQuin2014-10-311-2/+4
| | | |
| | | * Modify pedant to run w/o chefClaire McQuin2014-10-313-18/+12
| | | |
| | | * Change pending to skipClaire McQuin2014-10-311-1/+1
| | | |
| | * | Explicitly disable :should syntax in spec and mocksClaire McQuin2014-11-031-0/+8
| | | |
| | * | Remove remaining should syntax.Claire McQuin2014-11-031-4/+4
| | | |