Merge branch 'feature/1.6.x/9295-add_virtual_hyperv_detection' into 1.6.x

Reviewed-by: Adrien Thebo <adrien@puppetlabs.com>
(#9593) Require rubygems to handle json output for ruby 1.8.7.
Merge remote-tracking branch 'kbarber/ticket/9593-json_output' into 1.6.x

Reviewed-by: Adrien Thebo <adrien@puppetlabs.com>
Merge pull request #54 from mkincaid/ticket/next/2747

(#2747) Fix detection of xen0 vs xenu in Xen 3.2.
Merge remote-tracking branch 'mkincaid/ticket/next/2747' into 1.6.x
(#9517) Fix physicalprocessorcount on windows

A broken test led to a broken fact. The WMI.execquery was incorrectly stubbed
to return an array when the actual WMI.execquery does not return an array. This
means that length, which works on arrays, does not work with WMI.execquery.
This fixes both the fact and the test. The test is unfortunately lifted to a
higher level, but it has the benefit of being correct.

Thanks to Eric Stonfer for the fact fix.

Signed-off-by: Matthaus Litteken <matthaus@puppetlabs.com>
Merge pull request #61 from haus/ticket/1.6rc/9517

(#9517) Fix physicalprocessorcount on windows
Updated CHANGELOG for 1.6.1rc4
Merge branch '1.6rc' into 1.6.x
Merge branch '1.6rc'
Cleaned up Arch Linux detection routine

During operating system detection we have an unreachable elsif clause
for the Arch Linux systems
Merge pull request #62 from kavu/cleanup/archlinux_operating_system

Cleaned up Arch Linux detection routine
(#7996) Add solaris processor facts

Adds processorcount and physicalprocessorcount facts for solaris.

Added minor whitespace change for physicalprocessorcount spec that
ccompanied adding a solaris section to the spec.

Thanks to Merritt Krakowitzer for his contributions to this patch.
Merge branch 'ticket/master/7996-add_solaris_processor_facts' into 1.6.x

* ticket/master/7996-add_solaris_processor_facts:
  (#7996) Add solaris processor facts

Reviewed-by: Ken Barber <ken@bob.sh>
(#8240) Fixed regex pattern for domain

If given a search field of "search domain invalid", "invalid" would be
returned as the domain, when it should have been domain, due to
incorrect line anchoring. Added tests and corrected the regexes.
Merge branch 'ticket/master/8240-correct_domain_resolv_conf_regex' into 1.6.x

* ticket/master/8240-correct_domain_resolv_conf_regex:
  (#8240) Fixed regex pattern for domain

Reviewed-by: Ken Barber <ken@bob.sh>
(#8615) ENV hash is now local to tests

Added before and after hooks to store and restore environment data so
that changes to the hash do not persist between runs.
Merge branch 'ticket/master/8615' into 1.6.x

* ticket/master/8615:
  (#8615) ENV hash is now local to tests

Reviewed-by: Ken Barber <ken@bob.sh>
(#7996) Restrict solaris cpu processor detection

x86_64 based solaris machines have a pkg_core_id field in output of
kstat cpu_info, which denotes the core id of a specific core relative to
the cpu. This could cause misreporting of processor count. The regex to
count cores was restricted to prevent this. Additional x86_64 tests were
added to verify this behavior.
Merge branch 'feature/master/7996-tighten-core_id-regex' into 1.6.x

* feature/master/7996-tighten-core_id-regex:
  (#7996) Restrict solaris cpu processor detection

Reviewed-by: Ken Barber <ken@bob.sh>