Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #394 from jaymzh/6-lsblk6-stable | Phil Dibowitz | 2014-08-21 | 2 | -8/+2 |
|\ | | | | | Docs for last commit | ||||
| * | Docs for last commit | Phil Dibowitz | 2014-08-21 | 2 | -8/+2 |
|/ | |||||
* | Bump the version for 6.24.2 release.6.24.2 | Serdar Sutay | 2014-08-21 | 1 | -1/+1 |
| | |||||
* | Merge pull request #392 from jaymzh/fix_lsblk-6 | Phil Dibowitz | 2014-08-21 | 2 | -37/+66 |
|\ | | | | | [Ohai 6] Fix lsblk calls | ||||
| * | [Ohai 6] Fix lsblk calls | Phil Dibowitz | 2014-08-21 | 2 | -37/+66 |
|/ | | | | lsblk doesn't qualify device names, sadly | ||||
* | Bump version for 6.24.0 release.6.24.0 | Serdar Sutay | 2014-08-19 | 1 | -1/+1 |
| | |||||
* | Merge pull request #389 from jaymzh/6-ecmp-routes | Phil Dibowitz | 2014-08-16 | 3 | -6/+20 |
|\ | | | | | [Ohai 6] Add support for ECMP routes to linux::network | ||||
| * | [Ohai 6] Add support for ECMP routes to linux::network | Phil Dibowitz | 2014-08-15 | 3 | -6/+20 |
|/ | | | | Fixes #388 | ||||
* | Merge branch 'jaymzh-lsblk-6' into 6-stable | Claire McQuin | 2014-08-07 | 4 | -10/+148 |
|\ | | | | | | | | | | | Conflicts: CHANGELOG.md RELEASE_NOTES.md | ||||
| * | Merge branch 'lsblk-6' of github.com:jaymzh/ohai into jaymzh-lsblk-6 | Claire McQuin | 2014-08-07 | 4 | -15/+147 |
| |\ | |||||
| | * | [ohai 6] Linux::filesystems should prefer lsblk to blkid when available | Phil Dibowitz | 2014-07-03 | 4 | -15/+147 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | blkid has several bugs, and will miss a variety of things. For starters, it'll never report on a device that has partitions even if the parent is the thing with a filesystem on it. It has weird bugs like: http://marc.info/?l=linux-ext4&m=119636478426226&w=2 lsblk, on the other hand, probes everything in /sys/block and reports consistently. | ||||
* | | | Merge pull request #376 from jaymzh/mounts_6 | Phil Dibowitz | 2014-07-31 | 4 | -25/+46 |
|\ \ \ | | | | | | | | | Fix reading /proc/mounts harder | ||||
| * | | | Fix reading /proc/mounts harder | Phil Dibowitz | 2014-07-31 | 4 | -25/+46 |
|/ / / | | | | | | | | | | Due to kernel bugs we have to nonblock read. | ||||
* | | | Revert "Fix linux::filesystem reading of /proc/mounts" | Lamont Granquist | 2014-07-31 | 2 | -2/+2 |
| | | | | | | | | | | | | | | | | | | This reverts commit 144ec4c1e5ee4e881d944456b870cae723ea9b0f. See OHAI-196 | ||||
* | | | Merge pull request #372 from jaymzh/mounts_6 | Phil Dibowitz | 2014-07-31 | 2 | -2/+2 |
|\ \ \ | | | | | | | | | Fix linux::filesystem reading of /proc/mounts | ||||
| * | | | Fix linux::filesystem reading of /proc/mounts | Phil Dibowitz | 2014-07-31 | 2 | -2/+2 |
|/ / / | | | | | | | | | | | | | At the moment you only read 4K of data, which drops lots of important things. I don't know why anyone thought 4K would be sufficient. | ||||
* | | | Version tag for 6.24.0 Release Candidate.6.24.0.rc.0 | sersut | 2014-07-17 | 1 | -1/+1 |
| | | | |||||
* | | | Update CHANGELOG for release. | sersut | 2014-07-17 | 1 | -2/+2 |
| | | | |||||
* | | | Merge pull request #359 from opscode/mcquin/pin-rspec | Claire McQuin | 2014-07-07 | 1 | -3/+3 |
|\ \ \ | |/ / |/| | | pin rspec version to 2.14 | ||||
| * | | pin rspec version to 2.14mcquin/pin-rspec | Claire McQuin | 2014-07-07 | 1 | -3/+3 |
| |/ | |||||
* | | Merge pull request #357 from opscode/revert-355-mcquin/pin-rspec | Claire McQuin | 2014-07-07 | 1 | -3/+3 |
|\ \ | | | | | | | Revert "pin rspec version to 2.14" | ||||
| * | | Revert "pin rspec version to 2.14"revert-355-mcquin/pin-rspec | Claire McQuin | 2014-07-07 | 1 | -3/+3 |
|/ / | |||||
* | | Merge pull request #355 from opscode/mcquin/pin-rspec | Claire McQuin | 2014-07-07 | 1 | -3/+3 |
|\ \ | |/ |/| | pin rspec version to 2.14 | ||||
| * | pin rspec version to 2.14 | Claire McQuin | 2014-07-07 | 1 | -3/+3 |
|/ | |||||
* | Remove CONTRIBUTIONS.md and merge it's contents with CHANGELOG.md. | sersut | 2014-05-23 | 2 | -12/+6 |
| | |||||
* | Bump up the version number for release.6.22.0 | sersut | 2014-04-08 | 1 | -1/+1 |
| | |||||
* | Merge pull request #308 from jaymzh/df_6 | Phil Dibowitz | 2014-04-02 | 4 | -39/+55 |
|\ | | | | | Use a timeout when running 'df' and 'mount' | ||||
| * | Use a timeout when running 'df' and 'mount' | Phil Dibowitz | 2014-04-01 | 4 | -39/+55 |
|/ | | | | | | | | They can otherwise hang chef forever run when running on machines with hung NFS mounts. I changed only the calls that were necessary in order to minimize changes in the 6-stable branch. | ||||
* | OHAI-550: Reduce memory footprint of java in plugin | Bryan McLellan | 2014-04-01 | 3 | -10/+11 |
| | |||||
* | Version bump for RC release.6.22.0.rc.0 | sersut | 2014-03-30 | 1 | -4/+3 |
| | |||||
* | Merge pull request #296 from jaymzh/hostnamefix_6 | Phil Dibowitz | 2014-03-14 | 4 | -5/+29 |
|\ | | | | | Fix `hostname --fqdn` stupidity on linux -- ohai6 | ||||
| * | Fix `hostname --fqdn` stupidity on linux | Phil Dibowitz | 2014-03-13 | 4 | -5/+29 |
|/ | |||||
* | Merge pull request #292 from opscode/new-policy-files | Serdar Sutay | 2014-03-13 | 5 | -144/+37 |
| | | | | New policy files for OHAI. | ||||
* | Merge pull request #212 from opscode/lcg/java-stdout-bug | lamont-granquist | 2014-01-08 | 1 | -4/+4 |
|\ | | | | | swap order of redirects | ||||
| * | swap order of redirects | Lamont Granquist | 2013-10-11 | 1 | -4/+4 |
| | | | | | | | | - you need to dup2 before redirecting | ||||
* | | Clean up `jenkins_run_tests.bat` | Seth Chisamore | 2013-12-05 | 1 | -4/+11 |
| | | | | | | | | | | | | | | This change ensures the bat file is in sync with what we have in opscode/chef. Conflicts: ci/jenkins_run_tests.bat | ||||
* | | Merge pull request #235 from opscode/OHAI-537 | Bryan McLellan | 2013-12-04 | 2 | -2/+13 |
|\ \ | | | | | | | OHAI-537: Require the os plugin in the hostname plugin | ||||
| * | | OHAI-537: Require the os plugin in the hostname plugin | Bryan McLellan | 2013-12-04 | 2 | -2/+13 |
|/ / | | | | | | | | | | | The hostname plugin uses the os plugin, so it needs to be loaded first. In a normal run it happens to be loaded but if you're only running the hostname plugin it will fail without the os plugin. | ||||
* | | CHEF-4714 | jamescott | 2013-11-04 | 1 | -1/+1 |
| | | |||||
* | | fix to say "The version of Ohai." | jamescott | 2013-10-31 | 1 | -1/+1 |
| | | |||||
* | | Bump the version number to 6.20.0 for release.6.20.0 | sersut | 2013-10-31 | 1 | -1/+1 |
| | | |||||
* | | update man page per OHAI-515 | jamescott | 2013-10-28 | 2 | -3/+10 |
| | | |||||
* | | update Ohai man page | jamescott | 2013-10-22 | 1 | -18/+80 |
| | | |||||
* | | Bump the version to 6.20.0.rc.16.20.0.rc.1 | sersut | 2013-10-21 | 1 | -1/+1 |
| | | |||||
* | | Merge pull request #216 from opscode/systemu-version-pin | Serdar Sutay | 2013-10-18 | 1 | -9/+1 |
|\ \ | | | | | | | Pin version of systemu to the same version included in chef. | ||||
| * | | Pin version of systemu to the same version included in chef.systemu-version-pin | sersut | 2013-10-18 | 1 | -9/+1 |
| | | | |||||
* | | | OHAI-412 was reverted on the 6-stable branch | Bryan McLellan | 2013-10-18 | 0 | -0/+0 |
|/ / | | | | | | | | | | | | | | | The OHAI-412 changes are for Ohai 7.0.0+ and were accidentally merged to the 6-stable branch. They were reverted in these commits: 87042c00beb7e1563310d8d208a93216f89e5134 91edd2b8b7e7bd0c846efe773d131e98d4ed1229 | ||||
* | | Bump version for 6.20.0 RC.6.20.0.rc.0 | sersut | 2013-10-17 | 1 | -1/+1 |
| | | |||||
* | | Merge pull request #213 from opscode/lcg/force-encode | lamont-granquist | 2013-10-17 | 2 | -5/+26 |
|\ \ | | | | | | | Test for LANG=C and input contains UTF-8 | ||||
| * | | force encode all strings to UTF-8lcg/force-encode | Lamont Granquist | 2013-10-17 | 2 | -7/+8 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | - this is a bit of a hack for ohai-6 while we're still using popen4 instead of mixlib-shellout - this may mean that we poorly support ISO-8851 / Shift_JIS or other non-UTF-8 encodings for characters where there is no translation between the external encoding and UTF-8 - this essentially standardizes on using UTF-8 internally |