summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote branch 'stschulte/feature/master/5040' into nextPaul Berry2010-11-094-3/+33
|\ | | | | | | | | | | Manually resolved conflicts: lib/facter/virtual.rb spec/unit/virtual.rb
| * (#5040) fact virtual should detect hpvmStefan Schulte2010-11-034-3/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | With HP-UX you can build virtual machines that are often refered to as HP-VMs. This patch detecs HP-VMs by introducing a new function hpvm? that will check the output of /usr/bin/getconf MACHINE_MODEL. This should not depend on any tools that might be not installed. If inside a HP-VM the command will say something like ia64 hp server Integrity Virtual Machine while on real hardware the output could be ia64 hp server rx660 so searching for "Virtual Machine" should work. Currently it only works if the guest is also running HP-UX. (I guess this is the most common usecase).
* | Merge remote branch 'stschulte/ticket/master/5016' into nextPaul Berry2010-11-092-1/+7
|\ \ | | | | | | | | | | | | | | | Manually resolved conflicts: lib/facter/virtual.rb spec/unit/virtual.rb
| * | (#5016) is_virtual should be true on solaris zonesStefan Schulte2010-11-032-1/+7
| |/ | | | | | | | | | | | | While the fact virtual recognised solaris zones before, the is_virtual fact did not. With this patch applied is_virtual returns true on (non-global) zones
| |
| \
*-. \ Merge remote branches 'pnasrat/tickets/master/4889' and ↵Rein Henrichs2010-10-183-8/+9
|\ \ \ | | | | | | | | | | | | 'pnasrat/tickets/master/4956' into next
| | * | Make sure FreeBSD spec also works on systems that have /proc/cpuinfo.Hans de Graaff2010-09-181-0/+1
| | |/
| * / Issue #4889 Fact values should all be stringsPaul Nasrat2010-10-072-8/+8
| |/ | | | | | | Fix is_virtual fact to return strings rather than bools.
* | maint: Fix merge errorRein Henrichs2010-10-071-2/+0
| |
* | Merge branch 'ticket/master/4552' into nextRein Henrichs2010-10-055-1/+70
|\ \ | | | | | | | | | | | | | | | Conflicts: bin/facter lib/facter/application.rb
| * | [#4552] Updating --timing to report in milliseconds instead of secondsRein Henrichs2010-10-042-12/+5
| | |
| * | [#4552] Apply patch from Dean WilsonRein Henrichs2010-10-045-7/+77
| | |
| * | Better fix for Bug 4569: Uptime Fact is incorrect on WindowsWilliam Van Hevelingen2010-10-041-3/+6
| | | | | | | | | | | | | | | | | | Patch removes reliance on clock ticks and instead queries for last boot time and subtracts from Time.now Signed-off-by: William Van Hevelingen <wvan13@gmail.com>
| * | [#4289] operatingsystemrelease fact for oel, ovsRein Henrichs2010-10-042-2/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | When Facter returns operatingsystem as "oel" or "ovs", the operatingsystemrelease fact does not catch these properly, causing an error. Specs added to catch failure and case statement updated to catch "oel" and "ovs" as well as "OEL" and "OVS"
| * | Fix for bug #4569William Van Hevelingen2010-10-041-1/+1
| | | | | | | | | | | | | | | | | | | | | * getTickCount.call() is not an epoch time value so compute_uptime is not necessary Signed-off-by: William Van Hevelingen <wvan13@gmail.com>
| * | (#4558) Fail with message on --help errorsRein Henrichs2010-10-041-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | If rdoc/usage fails to load, tell the user why and fail. If another failure happens, report the error message and fail. Paired With: Jacob Helwig Signed-off-by: Rein Henrichs <rein@puppetlabs.com>
| * | [#4558] Refactor facter binary using optparseRein Henrichs2010-10-042-123/+108
| | | | | | | | | | | | | | | | | | | | | Simplify the binary by moving all application specific code into a new Facter::Application module. This module is then refactored to use OptionParser and to simplify invocation logic, while maintaining existing behavior.
| | |
| \ \
*-. \ \ Merge branches 'feature/master/4567' and 'feature/master/4563' into nextRein Henrichs2010-10-053-123/+190
|\ \ \ \
| | * | | [#4563] Add a --trace option to the binaryRein Henrichs2010-10-042-2/+10
| | | | |
| | * | | [#4558] Refactor facter binary using optparseRein Henrichs2010-10-042-123/+108
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | Simplify the binary by moving all application specific code into a new Facter::Application module. This module is then refactored to use OptionParser and to simplify invocation logic, while maintaining existing behavior.
| * | | (#4567) Remove unnecessary or non-portable redirectsRein Henrichs2010-10-041-3/+4
| | | | | | | | | | | | | | | | | | | | - Remove &> redirects, which are bash 4 only - Use git checkout -q instead of redirects to preserve fatal errors
| * | | (#4567) Retain detached HEAD stateRein Henrichs2010-10-041-3/+3
| | | | | | | | | | | | | | | | Allow facter-diff to start in and return to a detached HEAD
| * | | [#4567] Add ext/facter-diff to compare output of 2 versionsRein Henrichs2010-08-181-0/+73
| |/ / | | | | | | | | | | | | | | | Example: ./ext/facter-diff 1.5.5 1.5.8rc1
* | | Merge branch 'master' into nextRein Henrichs2010-10-0511-25/+103
|\ \ \ | | |/ | |/|
| * | Sync rpm spec file from Fedora/EPELTodd Zullinger2010-08-281-1/+19
| | |
| * | Rename Reductive Labs to Puppet LabsTodd Zullinger2010-08-285-9/+9
| | |
| * | Updated signing rake taskJames Turnbull2010-08-281-3/+3
| | |
| * | Updated CHANGELOG for 1.5.8James Turnbull2010-08-281-2/+7
| | |
| * | Updated install.rb and created man pageJames Turnbull2010-08-282-6/+54
| | |
| * | Merge branch 'ticket/master/4583'Rein Henrichs2010-08-251-3/+3
| |\ \
| | * | [#4583] Refactor uptime to use Resolution.execRein Henrichs2010-08-241-3/+3
| |/ / | | | | | | | | | Resolution.exec used to ensure that any shell errors are suppressed.
| * | [#4594] Reintroduce fix for #1291 from original patchRein Henrichs2010-08-241-3/+0
| | | | | | | | | | | | | | | The reverted patch contains a fix for #1291 that is desired. This commit reintroduces that change.
| * | Merge branch 'bug/master/4594'Rein Henrichs2010-08-243-12/+7
| |\ \
| * | | Updated CHANGELOG for 1.5.8rc2James Turnbull2010-08-211-0/+10
| | | |
* | | | Merge branch 'bug/master/4594' into nextRein Henrichs2010-08-243-12/+7
|\ \ \ \ | | |/ / | |/| |
| * | | [#4594] Revert "fixes #2573, #2085, #1291..."Rein Henrichs2010-08-233-12/+7
| |/ / | | | | | | | | | | | | | | | | | | | | | This is a revert of ticket #2573, which introduces a reverse DNS lookup to the resolution of fqdn. As per #3898, this does not corrently return the fqdn on all systems. This reverts commit dca615c98b864d75e2ac5899d98d04a2bd979eba.
* | | Merge branch 'master' into nextRein Henrichs2010-08-202-2/+41
|\| |
| * | Merge branch 'bug/master/4289'Rein Henrichs2010-08-202-2/+41
| |\ \
| | * | [#4289] operatingsystemrelease fact for oel, ovsRein Henrichs2010-08-182-2/+41
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | When Facter returns operatingsystem as "oel" or "ovs", the operatingsystemrelease fact does not catch these properly, causing an error. Specs added to catch failure and case statement updated to catch "oel" and "ovs" as well as "OEL" and "OVS"
* | | Merge branch 'master' into nextRein Henrichs2010-08-191-3/+6
|\| |
| * | Merge remote branch 'blkperl/bug/testing/4569'Rein Henrichs2010-08-191-3/+6
| |\ \ | | |/ | |/|
| | * Better fix for Bug 4569: Uptime Fact is incorrect on WindowsWilliam Van Hevelingen2010-08-191-3/+6
| | | | | | | | | | | | | | | | | | Patch removes reliance on clock ticks and instead queries for last boot time and subtracts from Time.now Signed-off-by: William Van Hevelingen <wvan13@gmail.com>
| | * Fix for bug #4569William Van Hevelingen2010-08-181-1/+1
| |/ | | | | | | | | | | | | * getTickCount.call() is not an epoch time value so compute_uptime is not necessary Signed-off-by: William Van Hevelingen <wvan13@gmail.com>
* | Merge branch 'ticket/master/3703-macaddress-on-mac' into nextRein Henrichs2010-08-1830-13/+583
|\ \
| * | Removing stupid .DS_Store files :(Rein Henrichs2010-08-112-0/+0
| | |
| * | [#3703] Fix macaddress fact for DarwinRein Henrichs2010-08-1132-13/+583
| | | | | | | | | | | | * With tests for 9.8.0, 10.3.0 and 10.6.4
* | | Merge branch 'ticket/master/2865-virtual-fact-reporting' into nextRein Henrichs2010-08-186-1/+172
|\ \ \ | |_|/ |/| |
| * | [#2865] Fix reporting of virtual factsRein Henrichs2010-08-186-1/+172
| |/ | | | | | | | | | | | | | | | | Regexp tested the s_context or VxID field if /proc/self/status and returned false for 0 and true for any other number. 0 indicates a host, which is still virtual. Fix changes regexp to correctly report hosts as virtual. Tested against vserver 2.1 and 2.3.
* | Fixed Rakefile package task version detectionJames Turnbull2010-08-181-1/+4
| |
* | Removed references to Reductive Labs in the RakefileJames Turnbull2010-08-181-3/+3
| |
* | Incremented version to 1.5.8James Turnbull2010-08-181-1/+1
| |