summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #4693 from nathwill/bugfix/thread-exclusiveLamont Granquist2016-03-111-3/+1
|\
| * rm unnecessary mutexNathan Williams2016-03-111-4/+1
| * fix deprecated Thread.exclusive with MutexNathan Williams2016-03-101-1/+2
* | Merge pull request #4699 from chef/move_pryMatt Wrock2016-03-111-4/+6
|\ \
| * | moving pry gems to their own very special groupMatt Wrock2016-03-111-4/+6
|/ /
* | Merge pull request #4696 from chef/lcg/yell-at-usersLamont Granquist2016-03-111-0/+3
|\ \
| * | this is a really, really bad setting to tweaklcg/yell-at-usersLamont Granquist2016-03-111-0/+3
* | | Merge pull request #4692 from chef/salam/mount-fixSalim Alam2016-03-112-0/+18
|\ \ \ | |/ / |/| |
| * | Update specSalim Alam2016-03-111-0/+12
| * | Make mount idempotent on Windowssalam/mount-fixSalim Alam2016-03-101-0/+6
| |/
* | Merge pull request #4683 from chef/salam/acceptance-tweakSalim Alam2016-03-117-0/+85
|\ \
| * | Add more cookbooks for Win64 test matrixsalam/acceptance-tweakSalim Alam2016-03-097-0/+85
* | | Merge pull request #4690 from chef/lcg/fix-escape-globLamont Granquist2016-03-1123-31/+42
|\ \ \
| * | | s/escape_glob/escape_glob_dir/lcg/fix-escape-globLamont Granquist2016-03-1023-31/+42
| | |/ | |/|
* | | Merge pull request #4694 from chef/vboxsfNoah Kantrowitz2016-03-111-1/+1
|\ \ \ | |/ / |/| |
| * | Vbox's shared filesystem driver uses non-file device names too. Noah Kantrowitz2016-03-101-1/+1
|/ /
* | Merge pull request #4686 from chef/cperry/add-cisco-supportNoah Kantrowitz2016-03-101-0/+24
|\ \
| * | Fixing typo on iosxr teamcperry/add-cisco-supportCarl Perry2016-03-091-1/+1
| * | Adding myself as LT and Maintainer for Cisco platformsCarl Perry2016-03-091-0/+24
|/ /
* | Use ruby 2.1.8 on both windows and unixjk/ruby-2.1.8John Keiser2016-03-091-11/+4
* | Merge pull request #4681 from coderanger/params-coerceNoah Kantrowitz2016-03-092-2/+2
|\ \ | |/ |/|
| * Fix property coercion in both places, because they were different and Noah Kantrowitz2016-03-092-2/+2
|/
* Merge pull request #4676 from MichaelPereira/patch-1Thom May2016-03-081-1/+1
|\
| * Fix typo in whyrun messageMichael Pereira2016-03-081-1/+1
|/
* Merge pull request #4661 from davide125/systemd-userPhil Dibowitz2016-03-085-51/+133
|\
| * rubocop fixesDavide Cavalca2016-03-071-4/+4
| * add a test for user servicesDavide Cavalca2016-03-041-8/+34
| * error out if provider doesn't support user servicesDavide Cavalca2016-03-043-0/+18
| * double quotes to make rubocop happyDavide Cavalca2016-03-031-6/+6
| * Extend service resource to support systemd user servicesDavide Cavalca2016-03-033-47/+85
* | Merge pull request #4673 from dduponchel/GH-2561Thom May2016-03-082-4/+33
|\ \
| * | preferred_manifest_record: fix pretty print.David Duponchel2016-03-072-4/+33
* | | Bump version to 12.8.112.8.1jk/bump-versionJohn Keiser2016-03-074-6/+11
|/ /
* | Merge pull request #4667 from chef/accept_dockerMatt Wrock2016-03-043-0/+16
|\ \
| * | adding docker to top_cookbooksMatt Wrock2016-03-043-0/+16
* | | Revert "Unpin github_changelog_generator"Lamont Granquist2016-03-041-1/+1
* | | Unpin github_changelog_generatorJohn Keiser2016-03-041-1/+1
|/ /
* | Merge pull request #4617 from chef/lcg/chefstyle-perfLamont Granquist2016-03-0473-106/+156
|\ \
| * | add some @yield docsLamont Granquist2016-03-0416-5/+53
| * | remove unused block argumentslcg/chefstyle-perfLamont Granquist2016-02-2325-29/+29
| * | Autofixing new Perf cops in 0.37.2Lamont Granquist2016-02-2363-75/+77
* | | Merge pull request #4651 from chef/tball/rehash_errorTyler Ball2016-03-048-4/+105
|\ \ \
| * | | Adding specs for rehash updatetyler-ball2016-03-046-3/+72
| * | | Changing the knife behavior when using the cached plugins to only display 1 e...tyler-ball2016-03-041-3/+21
| * | | First part of fixing the rehash command, it now always loads gems from disc i...tyler-ball2016-03-043-1/+15
|/ / /
* | | Merge pull request #4663 from chef/lcg/better-chef-rspec-constraintsLamont Granquist2016-03-0414-44/+39
|\ \ \
| * | | remove merge conflict resolution errorlcg/better-chef-rspec-constraintsLamont Granquist2016-03-031-4/+0
| * | | better chef+ruby rspec constraintsLamont Granquist2016-03-0314-42/+41
* | | | Merge pull request #4664 from chef/salam/databag-fixThom May2016-03-042-3/+55
|\ \ \ \
| * | | | Data bag item hash can have name keysalam/databag-fixSalim Alam2016-03-032-3/+55