summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | Merge branch 'ticket/next/1423' into nextMatt Robinson2010-12-062-7/+56
| |\ \ | | | | | | | | | | | | | | | | * ticket/next/1423: (#1423) Memory facts for Solaris
| | * | (#1423) Memory facts for SolarisDominic Cleal2010-12-062-7/+56
| |/ / | | | | | | | | | | | | Add total memory from prtconf output, free from vmstat plus swap free and total from swap -l listing.
* | | Merge commit '3ebb5a5'Daniel Pittman2011-01-312-7/+126
|\| |
| * | Merge branch 'ticket/next/4754' into nextMatt Robinson2010-11-302-7/+126
| |\ \ | | | | | | | | | | | | | | | | | | | | * ticket/next/4754: (#4754) Change is_virtual logic to not enumerate virtual types (#4754) Add support for Darwin and Parallels VM to "virtual" fact
| | * | (#4754) Change is_virtual logic to not enumerate virtual typesMatt Robinson2010-11-302-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | While looking at the patch for adding parallels to the virtual types David Schmitt noticed that it might be easier just to list the types that are NOT virtual since there's fewer of them. Paired-with: Nick Lewis
| | * | (#4754) Add support for Darwin and Parallels VM to "virtual" factDonavan Miller2010-11-302-6/+120
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds support for Parallels VM guest detection with existing operating systems. Detects Parallels based on hardware vendor name and pci id. The Parallels vendor id does not seem to be listed in most pci.ids. Adds resolution for "virtual" fact in the Darwin kernel. This uses the existing Facter::Util::Macosx module to resolve system profiler data. Both vendor name and vendor id values are checked. Resolution appears to vary based on VM Host product. Signed-off-by: donavanm <donavan@desinc.net>
* | | Merge branch 'next'Nick Lewis2010-11-235-7/+40
|\| |
| * | Merge branch 'ticket/next/5325' into nextMatt Robinson2010-11-223-1/+34
| |\ \ | | | | | | | | | | | | | | | | | | | | * ticket/next/5325: (#5325) Add tests for SPARC manufacturer and product name (#5325) Manufacturer and product name on SPARC
| | * | (#5325) Add tests for SPARC manufacturer and product nameMatt Robinson2010-11-221-1/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Just tests the regex, won't actually catch problems if prtdiag doesn't return output like our test. Paired-with: Nick Lewis
| | * | (#5325) Manufacturer and product name on SPARCDominic Cleal2010-11-222-0/+22
| |/ / | | | | | | | | | | | | Use prtdiag output on Solaris/SPARC to determine manufacturer and productname as smbios is unavailable.
| * | Merge branch 'maint/next/fix_space_related_spec_failures' into nextNick Lewis2010-11-222-6/+6
| |\ \
| | * | maint: Fix spec failures caused by having a space in the path to facter's sourceNick Lewis2010-11-222-6/+6
| |/ /
* | | Merge branch 'next'Paul Berry2010-11-172-1/+13
|\| |
| * | Merge branch 'maint/next/spec_rake_fix' into nextMatt Robinson2010-11-121-0/+1
| |\ \ | | | | | | | | | | | | | | | | * maint/next/spec_rake_fix: maint: require rubygems so hudson can run the specs
| | * | maint: require rubygems so hudson can run the specsMatt Robinson2010-11-121-0/+1
| |/ /
| * | Merge branch 'maint/next/add_local_branch_to_mail_patches' into nextPaul Berry2010-11-121-1/+12
| |\ \
| | * | Maint: add "Local-branch:" info to mails sent by "rake mail_patches"Paul Berry2010-11-121-1/+12
| |/ /
* | | Merge branch 'next'Paul Berry2010-11-1048-148/+1123
|\| | | | | | | | | | | This marks the end of the agile iteration from 11/3-11/10.
| * | Merge branch 'ticket/next/4989' into nextPaul Berry2010-11-094-0/+47
| |\ \
| | * | (#4989) Add xendomains factRein Henrichs2010-11-094-0/+47
| |/ / | | | | | | | | | | | | Parses `/usr/sbin/xm list` and returns a comma-separated list of domains. Based on a patch submitted by Jonas Genannt.
| * | Merge remote branch 'lusis/next' into nextPaul Berry2010-11-092-1/+17
| |\ \
| | * | JSON support. Works in 1.9.1. Warnings in 1.9.2. LoadError on 1.8.7 for some ↵John E. Vincent2010-11-042-1/+17
| | | | | | | | | | | | | | | | reason
| * | | 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
| | |