summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | Merge remote branch 'barn/tickets/master/6714' into nextJames Turnbull2011-03-151-1/+1
| |\ \
| | * | Remove Solaris from the list of confined systems. It won't get the original ↵Ben Hughes2011-03-151-1/+1
| |/ / |/| | | | | | | | lsb facts, and it's nonsensical too.
| * | Merge branch 'tickets/master/5699' into nextJames Turnbull2011-03-154-4/+30
| |\ \
| | * | Fixed #5699 - Added processorcount support for S390xJames Turnbull2011-03-071-2/+5
| | | | | | | | | | | | | | | | Patch from Hector Rivas
| | * | Fixed #5699 - Added virtual support for s390x/ZlinuxJames Turnbull2011-03-073-2/+25
| | | | | | | | | | | | | | | | Patch modified from Hector Rivas
| * | | Merge branch 'ticket/master/6679' into nextJames Turnbull2011-03-122-6/+8
| |\ \ \
| | * | | Fix #6679 - Added Scientific Linux to operatingsystem factJames Turnbull2011-03-112-6/+8
| |/ / / |/| | | | | | | | | | | Thanks to James Goddard for the patch
| * | | Further fix to #5485 - SELinux factsJames Turnbull2011-03-113-3/+66
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 1. Added new facts for all values returned by the sestatus command 2. Updated legacy selinux_mode fact with former value 3. Added note and ticket #6677 to remove legacy fact at Facter 2.0.0 4. Added tests for new facts and legacy fact
| * | | Merge branch 'tickets/master/6495' into nextJames Turnbull2011-03-093-26/+21
| |\ \ \
| | * | | Fix for #6495 - Updated interface detectionJames Turnbull2011-03-093-26/+21
| |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1. Fixed IP return to not filter lo/localhost and return it as a proper interface 2. Fixed HP-UX netstat return to remove extraneous first line of naming. 3. Updated tests to reflect changes
| * | | Merge branch 'tickets/master/5385' into nextJames Turnbull2011-03-093-6/+23
|/| | |
| * | | (#5485) Made selinux_mode fact workAdrien Thebo2011-03-091-4/+3
| | | | | | | | | | | | | | | | | | | | Changed regular expression to be case insensitive for cross platform compatibility.
| * | | Fixed #5485 - Updated selinux_mode factJames Turnbull2011-03-093-6/+24
| | | | | | | | | | | | | | | | | | | | | | | | 1. Added tested 2. Refactored to use F:U:R.exec 3. Chomp trailing newline
* | | | Merge branch 'next'Jacob Helwig2011-03-0810-40/+48
|\| | | | |_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * next: Fixed #5950 - Solaris ipaddress incorrect after bonding failure (#6615) fix missing stub calls in loader specs (#5666) windows support for facter/id.rb (#4925) - MS Windows doesn't do man pages Fixed #6611 - Fixed broken HPVM test and rationalised test structure (#6525) change semicolons to 'then' in case statement for ruby 1.9.2 compatibility Fixes #6521 and other Ruby 1.9 issues Fixed #6525 - Test failures on Ruby 1.9.x (#5031) Remove redundant puts from RDoc.usage
| * | Merge branch 'tickets/master/5950'James Turnbull2011-03-071-1/+1
| |\ \
| | * | Fixed #5950 - Solaris ipaddress incorrect after bonding failureDominic Cleal2011-03-071-1/+1
| |/ /
| * | (#6615) fix missing stub calls in loader specsRick Bradley2011-03-071-2/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It's not clear to me how these are now needed and apparently weren't when we first checked this in. These stubs will let the specs continue on so we can check the load order, which was the original intent of (#5510) which caused the introduction of these specs. Signed-off-by: Rick Bradley <rick@rickbradley.com>
| * | Merge branch 'feature/master/5666'James Turnbull2011-03-071-1/+1
| |\ \
| | * | (#5666) windows support for facter/id.rbWilliam Van Hevelingen2011-03-071-1/+1
| |/ / | | | | | | | | | Signed-off-by: William Van Hevelingen <wvan13@gmail.com>
| * | (#4925) - MS Windows doesn't do man pagesWilliam Van Hevelingen2011-03-071-10/+18
| | | | | | | | | | | | | | | | | | Added logic to prevent installation of man pages on windows Signed-off-by: William Van Hevelingen <wvan13@gmail.com>
| * | Merge branch 'tickets/next/5031'James Turnbull2011-03-071-1/+1
| |\ \ | | |/ | |/|
| | * (#5031) Remove redundant puts from RDoc.usagePaul Berry2010-10-181-1/+1
| | | | | | | | | | | | | | | | | | | | | RDoc.usage prints the usage string. As a result, `puts RDoc.usage` is redundant and unnecessary. See http://ruby-doc.org/core/classes/RDoc.html#M004706.
| * | Merge branch 'tickets/master/6611'James Turnbull2011-03-071-15/+8
| |\ \
| | * | Fixed #6611 - Fixed broken HPVM test and rationalised test structureJames Turnbull2011-03-071-15/+8
| |/ /
| * | Merge branch 'tickets/master/6521'James Turnbull2011-03-072-6/+6
| |\ \
| | * | Fixes #6521 and other Ruby 1.9 issuesJames Turnbull2011-03-023-8/+8
| | | | | | | | | | | | | | | | Tested on Ruby 1.9.2p180
| * | | Merge commit '84fa3c440edefd117ce8a7fa5fb13d76b66ec7db'James Turnbull2011-03-071-2/+2
| |\ \ \
| | * | | (#6525) change semicolons to 'then' in case statement for ruby 1.9.2 ↵Matt2011-03-051-2/+2
| | | | | | | | | | | | | | | | | | | | compatibility
| * | | | Merge branch 'tickets/master/6525'James Turnbull2011-03-071-2/+2
|/| | | | | |/ / /
| * / / Fixed #6525 - Test failures on Ruby 1.9.xJames Turnbull2011-03-021-2/+2
| |/ /
* | | Merge branch 'feature/next/2270-ipv6-support' into nextDaniel Pittman2011-02-179-33/+179
|\ \ \
| * | | (#2270) add testing for the new ipaddress6 featureDaniel Pittman2011-02-175-0/+106
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This stubs out the platform side of the code, and uses fixtures emitting the right output from the interface configuration tools. Paired-With: Matt Robinson <matt@puppetlabs.com> Paired-With: Max Martin <max@puppetlabs.com>
| * | | (#2270) add IPv6 support to facter core.Daniel Pittman2011-02-173-1/+72
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now that IPocalypse has happened, IPv6 support in Facter core would be nice to have. So, we add the appropriate code to start handling that. The ipaddress6 fact as supplied included some smart code to try determining the "primary" address using DNS to resolve the AAAA record for the host FQDN. While this was smart, it actually didn't work: facter prefers the longest confine list, so the *stupid* mechanisms that were kernel-specific would override the smarter and more portable mechanisms. We strip that code out for now, which also brings this into line with the existing ipaddress fact; improving both would be good, but it should be uniform. Paired-With: Matt Robinson <matt@puppetlabs.com> Paired-With: Max Martin <max@puppetlabs.com>
| * | | (#2270) Remove DWIM code from ipaddress on Darwin.Daniel Pittman2011-02-171-32/+1
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This mirrors the behaviour of the newer code, and eliminates some DWIM work we do on a single, specific platform that should, better, be done on a global platform. This would be reintroduced globally, applied to all platforms, or otherwise rebuilt from a consistent base of specified behaviour. Paired-With: Matt Robinson <matt@puppetlabs.com> Paired-With: Max Martin <max@puppetlabs.com>
* / / (#6360) Flush Facter top level cache before every test case.Daniel Pittman2011-02-171-1/+6
|/ / | | | | | | | | | | | | | | This adds a suite-wide "Facter.clear" call before :each test case to ensure that we can't accidentally cache data when we are invoked using top level Facter interfaces to get at data. Paired-with: Jacob Helwig <jacob@puppetlabs.com>
* | Merge remote branch 'origin/next'Jesse Wolfe2011-02-0219-28/+145
|\ \
| * \ Merge branch 'bug/next/4755-debian-freebsd-kernel-support' into nextDaniel Pittman2011-01-3117-26/+100
| |\ \
| | * | Fix #4755: add support for GNU/kFreeBSD platform where missing.Marc Fournier2011-01-3117-26/+100
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | Merged manually to the current state of the art. Minimal conflicts resolved by adding both Darwin and GNU/KFreeBSD to the confine lines. Author: Marc Fournier <marc.fournier@camptocamp.com> Signed-off-by: Daniel Pittman <daniel@puppetlabs.com> Signed-off-by: Rick Bradley <rick@rickbradley.com>
| * | Merge branch 'bug/next/5510-deterministic-fact-load-order' into nextDaniel Pittman2011-01-312-2/+45
| |\ \
| | * | (#5510) Facter should load custom fact definitions in filename order.Rick Bradley2011-01-312-2/+45
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ruby's Dir.entries will return files in different orders depending on the OS and/or filesystem. As a result Facter::Util::Loader will load ruby custom fact definitions in different orders on different platforms. Specs to expose the bugs, and code to ensure that custom fact files are loaded in alphabetical order. Addresses redmine issue #5510 http://projects.puppetlabs.com/issues/5510 Signed-off-by: Rick Bradley <rick@rickbradley.com> Signed-off-by: Daniel Pittman <daniel@puppetlabs.com>
* | | Merge commit 'd9b8f2a'Daniel Pittman2011-01-3131-118/+206
|\| |
| * | Merge branch 'feature/next/6044-use-rspec2' into nextDaniel Pittman2011-01-2724-63/+47
| |\ \
| | * | Refactor #6044 -- use _spec.rb as the pattern for spec tests.Daniel Pittman2011-01-2722-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | Rename all the spec tests to follow the rspec convention of *_spec.rb rather than unadorned *.rb; this also makes it easier to work with them consistently without using the Rakefile support that customizes that.
| | * | Refactor #6044 -- require spec_helper with a consistent path.Daniel Pittman2011-01-2721-21/+21
| | | | | | | | | | | | | | | | | | | | | | | | Because we pull in spec_helper in individual tests, we need to use a consistent path or Ruby will evaluate it multiple times. Make the path consistent by expanding it before require.
| | * | Refactor #6044 -- port testing to rspec2Daniel Pittman2011-01-279-42/+26
| |/ / | | | | | | | | | We have moved to rspec2 for puppet, and facter should follow suit.
| * | Merge branch 'issue/next/5086' into nextJacob Helwig2011-01-243-28/+59
| |\ \ | | | | | | | | | | | | | | | | | | | | * issue/next/5086: (#5086) Try using kstat before falling back to 'who -b' to determine uptime. Refactor util/uptime.rb tests to reduce duplication using contexts
| | * | (#5086) Try using kstat before falling back to 'who -b' to determine uptime.Jacob Helwig2011-01-243-9/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'who -b' doesn't report the year of the last system boot on (at least) Solaris 10, and OpenSolaris 2009.06. Try using 'kstat -p unix:::boot_time', which reports as seconds since the epoch on these systems before falling back to 'who -b'. Reviewed-by: Paul Berry <paul@puppetlabs.com>
| | * | Refactor util/uptime.rb tests to reduce duplication using contextsJacob Helwig2011-01-241-27/+34
| |/ / | | | | | | | | | Reviewed-by: Paul Berry <paul@puppetlabs.com>
| * | Merge branch 'feature/next/4575' into nextMatt Robinson2010-12-212-0/+24
| |\ \ | | | | | | | | | | | | | | | | * feature/next/4575: (#4575) win32 support for manufacturer, productname, & serialnumber
| | * | (#4575) win32 support for manufacturer, productname, & serialnumberWilliam Van Hevelingen2010-12-212-0/+24
| |/ / | | | | | | | | | Signed-off-by: William Van Hevelingen <wvan13@gmail.com>