summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge remote branch 'stschulte/feature/master/5040' into nextPaul Berry2010-11-094-3/+33
|\
| * (#5040) fact virtual should detect hpvmStefan Schulte2010-11-034-3/+33
* | Merge remote branch 'stschulte/ticket/master/5016' into nextPaul Berry2010-11-092-1/+7
|\ \
| * | (#5016) is_virtual should be true on solaris zonesStefan Schulte2010-11-032-1/+7
| |/
| |
| \
*-. \ Merge remote branches 'pnasrat/tickets/master/4889' and 'pnasrat/tickets/mast...Rein Henrichs2010-10-183-8/+9
|\ \ \
| | * | 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
| |/
* | maint: Fix merge errorRein Henrichs2010-10-071-2/+0
* | Merge branch 'ticket/master/4552' into nextRein Henrichs2010-10-055-1/+70
|\ \
| * | [#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
| * | [#4289] operatingsystemrelease fact for oel, ovsRein Henrichs2010-10-042-2/+41
| * | Fix for bug #4569William Van Hevelingen2010-10-041-1/+1
| * | (#4558) Fail with message on --help errorsRein Henrichs2010-10-041-1/+6
| * | [#4558] Refactor facter binary using optparseRein Henrichs2010-10-042-123/+108
| | |
| \ \
*-. \ \ 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
| | |/ /
| * | | (#4567) Remove unnecessary or non-portable redirectsRein Henrichs2010-10-041-3/+4
| * | | (#4567) Retain detached HEAD stateRein Henrichs2010-10-041-3/+3
| * | | [#4567] Add ext/facter-diff to compare output of 2 versionsRein Henrichs2010-08-181-0/+73
| |/ /
* | | 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
| |/ /
| * | [#4594] Reintroduce fix for #1291 from original patchRein Henrichs2010-08-241-3/+0
| * | 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
| |/ /
* | | 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
| | |/
* | | 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
| | * Fix for bug #4569William Van Hevelingen2010-08-181-1/+1
| |/
* | 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
* | | 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
| |/
* | 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