summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* rspec-rubocop autofix the specsrubocop_rspecTim Smith2016-12-01129-804/+804
| | | | Signed-off-by: Tim Smith <tsmith@chef.io>
* Merge pull request #910 from chef/8.22.0v8.22.0Tim Smith2016-11-304-4/+40
|\ | | | | Release 8.22.0
| * Release 8.22.0Tim Smith2016-11-304-4/+40
|/ | | | Signed-off-by: Tim Smith <tsmith@chef.io>
* Merge pull request #909 from chef/bahamas10-dave-1426559693Tim Smith2016-11-302-47/+54
|\ | | | | Rework / fix logic in the joyent plugin and improve specs
| * Rework the specsbahamas10-dave-1426559693Tim Smith2016-11-291-33/+45
| | | | | | | | | | | | These specs weren’t covering the actual meat of the plugin. They mocked out the methods, when the methods are where the majority of logic exists. Instead of mocking those methods mock out the files on disk. This also serves to document the structure of the files we’re parsing in the plugin so that’s another win. Signed-off-by: Tim Smith <tsmith@chef.io>
| * Use a regex vs. a split that didn’t seem to workTim Smith2016-11-291-3/+1
| | | | | | | | Signed-off-by: Tim Smith <tsmith@chef.io>
| * Return an empty array to avoid failures later with .eachTim Smith2016-11-291-1/+1
| | | | | | | | Signed-off-by: Tim Smith <tsmith@chef.io>
| * Set the attribute to nil vs. reading the file twiceTim Smith2016-11-291-1/+1
| | | | | | | | | | | | Nil is used throughout Ohai Signed-off-by: Tim Smith <tsmith@chef.io>
| * Merge branch 'dave-1426559693' of git://github.com/bahamas10/ohai into ↵Tim Smith2016-11-291-11/+8
| |\ | | | | | | | | | bahamas10-dave-1426559693
| | * cleanup joyent.rbDave Eddy2015-05-051-13/+10
| | | | | | | | | | | | | | | | | | - condense code - touch up style - don't stat(2) before open(2)
* | | Merge pull request #908 from numericillustration/masterThom May2016-11-301-1/+5
|\ \ \ | | | | | | | | fix for #891 to detect the global zone of a Solaris system as a Virt …
| * | | chefstyle fixesMichael Hicks2016-11-291-1/+1
| | | | | | | | | | | | | | | | Signed-off-by: Michael Hicks <michael.hicks@joyent.com>
| * | | fix for #891 to detect the global zone of a Solaris system as a Virt host ↵Michael Hicks2016-11-291-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | even when not currently hosting any guests Signed-off-by: Michael Hicks <michael.hicks@joyent.com>
* | | | Merge pull request #912 from chef/appveyerTim Smith2016-11-291-1/+1
|\ \ \ \ | | | | | | | | | | Test on 2012 R2 in appveyer
| * | | | Test on 2012 R2 in appveyerappveyerTim Smith2016-11-291-1/+1
| | |/ / | |/| | | | | | | | | | | | | | | | | | This matches Chef Signed-off-by: Tim Smith <tsmith@chef.io>
* | | | Merge pull request #913 from chef/changeloggenTim Smith2016-11-291-0/+2
|\ \ \ \ | | | | | | | | | | Match github changelog config with chef/chef
| * | | | Match github changelog config with chef/chefchangeloggenTim Smith2016-11-291-0/+2
| |/ / / | | | | | | | | | | | | Signed-off-by: Tim Smith <tsmith@chef.io>
* | | | Merge pull request #911 from chef/ghTim Smith2016-11-291-0/+15
|\ \ \ \ | | | | | | | | | | Add a github pull request template
| * | | | Add a github pull request templateghTim Smith2016-11-291-0/+15
| |/ / / | | | | | | | | | | | | Signed-off-by: Tim Smith <tsmith@chef.io>
* | | | Merge pull request #914 from chef/haskell_fixTim Smith2016-11-292-3/+25
|\ \ \ \ | |/ / / |/| | | Handle the non-git built haskell stack version shellout format
| * | | Handle the non-git built haskell stack version shellout formathaskell_fixTim Smith2016-11-292-3/+25
|/ / / | | | | | | | | | | | | | | | | | | splitting fields is fragile. Use a regex instead and add a spec for both formats. Signed-off-by: Tim Smith <tsmith@chef.io>
* | | Merge pull request #902 from cdituri/feature-haskell-pluginThom May2016-11-292-0/+304
|\ \ \ | | | | | | | | Added haskell language plugin for ohai
| * | | Added haskell language plugin for ohaiChris Dituri2016-11-112-0/+304
| | | | | | | | | | | | | | | | | | | | | | | | Detects whether ghc, ghci, cabal, or stack are installed Signed-off-by: Chris Dituri <csdituri@gmail.com>
* | | | Merge pull request #822 from chef/OHAI-794/set-attributeThom May2016-11-292-9/+71
|\ \ \ \ | |_|/ / |/| | | Extend set_attribute to set sub-attributes.
| * | | Extend set_attribute to set sub-attributes.OHAI-794/set-attributemcquin2016-06-092-9/+71
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use: - set_attribute(:attr, value) assigns attribute 'attr' value. - set_attribute(:attr, :subattr, value) assigns attribute 'attr/subattr' value. Extends to subattributes of arbitrary depth. Raises a TypeError if some :subattr is not an Array, Hash, or Mash (e.g., a String value).
* | | | Merge pull request #890 from n-marton/masterBryan McLellan2016-11-222-4/+41
|\ \ \ \ | |_|/ / |/| | | ip_scopes update
| * | | tunnel has to be written with two n-sMarton Natko2016-11-221-2/+2
| | | | | | | | | | | | | | | | Signed-off-by: Marton Natko <marton.natko@gmail.com>
| * | | even more typosMarton Natko2016-10-261-1/+1
| | | | | | | | | | | | | | | | Signed-off-by: Marton Natko <marton.natko@gmail.com>
| * | | plus the filesMarton Natko2016-10-252-4/+41
| | | | | | | | | | | | | | | | Signed-off-by: Marton Natko <marton.natko@gmail.com>
| * | | Merge branch 'master' of github.com:n-marton/ohaiMarton Natko2016-10-250-0/+0
| |\ \ \ | | | | | | | | | | | | | | | Signed-off-by: Marton Natko <marton.natko@gmail.com>
| * \ \ \ added docker and tunl type interfaces to ip_scopesTim Smith2016-10-251-0/+5
| |\ \ \ \ | | | | | | | | | | | | | | | | | | Signed-off-by: Marton Natko <marton.natko@gmail.com>
* | \ \ \ \ Merge pull request #898 from chef/old_helpersThom May2016-11-102-12/+0
|\ \ \ \ \ \ | | | | | | | | | | | | | | Remove Ruby 1.8 / 1.9 spec helpers
| * | | | | | Remove Ruby 1.8 / 1.9 spec helpersold_helpersTim Smith2016-11-092-12/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Tim Smith <tsmith@chef.io>
* | | | | | | Merge pull request #899 from chef/depsThom May2016-11-102-13/+9
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | Move dev deps to the Gemfile and bump changelog generator
| * | | | | | Move dev deps to the Gemfile and bump changelog generatordepsTim Smith2016-11-092-13/+9
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This removes the need for Rack 1.X which we had to pin due to the old github changelog generator release. We now have a new active support pin to keep Ruby 2.1 support Signed-off-by: Tim Smith <tsmith@chef.io>
* | | | | | Merge pull request #895 from chef/notesTim Smith2016-11-091-4/+0
|\ \ \ \ \ \ | | | | | | | | | | | | | | Wipe the release notes
| * | | | | | Wipe the release notesnotesTim Smith2016-11-091-4/+0
| | |_|/ / / | |/| | | | | | | | | | These were very out of date
* | | | | | Merge pull request #894 from chef/doc_changesTim Smith2016-11-091-81/+0
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Remove the doc changes doc
| * | | | | Remove the doc changes docdoc_changesTim Smith2016-11-091-81/+0
|/ / / / / | | | | | | | | | | We're not using these anymore
* | | | | Merge pull request #889 from chef/mvpsTim Smith2016-10-181-0/+5
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / / Add new MVPs for the last few releases
| * | | Add new MVPs for the last few releasesmvpsTim Smith2016-10-181-0/+5
|/ / / | | | | | | | | | | | | | | | Get @johnbellone @davide125 @natewalck @jaymzh and @jerearista on here Signed-off-by: Tim Smith <tsmith@chef.io>
* | | Merge pull request #873 from kylev/kv_lsb_orderTim Smith2016-10-182-16/+17
|\ \ \ | | | | | | | | Prefer the LSB standard configurator.
| * | | Prefer the LSB standard configurator.Kyle VanderBeek2016-09-022-16/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There isn't and has never been mention of /etc/lsb-release in the official LSB universe. The "correct" way to discover LSB data is with lsb_release, so this uses that facility first, before falling back to oddball support. Without this change, some upgraded boxen will have the wrong results because an outdated /etc/lsb-release may have been left behind with different contents than what would come from the lsb_release util. See: http://refspecs.linuxfoundation.org/LSB_5.0.0/LSB-Core-generic/LSB-Core-generic/lsbrelease.html http://refspecs.linuxfoundation.org/LSB_5.0.0/LSB-Core-generic/LSB-Core-generic/etc.html
* | | | Merge pull request #884 from erikng/masterTim Smith2016-10-181-1/+26
|\ \ \ \ | | | | | | | | | | Add logic to darwin hostname
| * | | | Add logic to darwin hostnameErik Gomez2016-09-291-1/+26
| | | | |
* | | | | Merge pull request #888 from chef/8.21v8.21.0Tim Smith2016-10-182-3/+15
|\ \ \ \ \ | | | | | | | | | | | | Release 8.21
| * | | | | Release 8.218.21Tim Smith2016-10-162-3/+15
|/ / / / / | | | | | | | | | | | | | | | Signed-off-by: Tim Smith <tsmith@chef.io>
* | | | | Merge pull request #881 from coderanger/shardseed-docsClaire McQuin2016-10-031-0/+72
|\ \ \ \ \ | |/ / / / |/| | | | Doc changes for #877
| * | | | Fix typo.Noah Kantrowitz2016-09-221-1/+1
| | | | |
| * | | | Better doc about ohai config files.Noah Kantrowitz2016-09-221-1/+7
| | | | | | | | | | | | | | | @jaymzh is this correct?
View Lorry Controller Status