Update lib/facter/version.rb for 1.6.14
Merge branch 'release/1.6.x/1.6.14' into 1.6.x
Revert "Merge pull request #205 from jeffweiss/ticket/master/12147_remove_iphostnumber_fact"

This reverts commit b12cad57790d10034ba1ac1291dd3ca6cb3b8dda, reversing
changes made to 15385641bd2ed764c347834b7f1248c75630b1fa.

This commit is being reverted on the 1.7.x branch in order to get rid of
backwards incompatible changes that had been made in anticipation of a
Facter 2 release.
Revert "Merge pull request #204 from jeffweiss/ticket/master/11466_remove_duplicate_memorytotal_fact"

This reverts commit 15385641bd2ed764c347834b7f1248c75630b1fa, reversing
changes made to c6aa778e6a62dd5a4f9d3bd929a41b460ae3d1e9.

Conflicts:

	lib/facter/memory.rb
	spec/unit/memory_spec.rb

This is being put back in for the 1.7 series of facter.
Revert "Merge pull request #208 from hkenney/ticket/master/14469_strip_whitespace_from_frozen_strings"

This reverts commit d5a3ff7f5561b1dafbcd234b4b5c6f9a58ba6f1b, reversing
changes made to 634f2f6a57b461926afcb2e07dcfe4ed659f5b0c.

Conflicts:

	spec/unit/util/resolution_spec.rb

This is being reverted from the 1.7.x branch in order to have a release
of non-breaking changes.
Revert "Merge pull request #202 from hkenney/ticket/master/3226_strip_whitespace_from_fact"

This reverts commit bc109e7ff5bbc5f8107c555345db64e17317eebb, reversing
changes made to 94d0d13ddfd2773573a007136bd8c52d4b8bafc0.

Conflicts:

	spec/unit/util/resolution_spec.rb

This is being reverted from the 1.7.x branch in order to have a release
of non-breaking changes.
(#11612) Add support for processorX facts on HP-UX

Without this patch applied, the processorX facts are not available on
HP-UX platforms.  This is a problem because the lack of these facts make
it difficult to write Puppet manifests that work on HP-UX and other
platforms like Linux that support the processorX facts.

These methods involve using machinfo when it is available, using
sched.models and getconf when machinfo is not available.  A suite of
RSpec tests are included as well as fixture files for four selected
examples of machinfo outputs, a sample sched.models file and unistd.h.
Merge branch 'alexharv074-ticket/1.6.x/11612_add_support_for_hpux_processor' into 1.6.x

* alexharv074-ticket/1.6.x/11612_add_support_for_hpux_processor:
  (#11612) Add support for processorX facts on HP-UX
Merge branch '1.6.x' into 1.7.x

* 1.6.x: (31 commits)
  (#11612) Add support for processorX facts on HP-UX
  Update lib/facter/version.rb for 1.6.14
  (#16511) Do not call arp -an on Solaris nodes
  (maint) Add .yardopts file
  Update lib/facter/version.rb for 1.6.14-rc1
  (Maint) Remove aliases for spec from Rakefile
  Maint: fix mismatched stub
  (#16397) Update selinux_mount_point for 1.8.5 compatibility
  (#11609) Fix processorX facts for AIX systems
  (#8210) Add a heavy virtual fact using virt-what
  (maint) Properly indent virtual_spec.rb
  (maint) Cleanup of the virtual spec tests.
  (maint) Add mailmap for git shortlog
  (maint) Remove rspec from shebang lines
  (maint) Add newlines to all files (whitespace only)
  (#16527) Fix processorcount fact on Solaris
  (#16526) Fix physicalprocessorcount fact on Solaris
  (#16506) Fix illegal option error from uname on hpux
  (#13535) Fix uptime; use `uptime` instead of `who -b`
  (#14764) Stop calling enum_cpuinfo and enum_lsdev on unsuitable platforms
  ...

Conflicts:
	CHANGELOG
	lib/facter/util/processor.rb
	lib/facter/version.rb
	spec/integration/facter_spec.rb
	spec/unit/architecture_spec.rb
	spec/unit/domain_spec.rb
	spec/unit/ec2_spec.rb
	spec/unit/facter_spec.rb
	spec/unit/hostname_spec.rb
	spec/unit/id_spec.rb
	spec/unit/interfaces_spec.rb
	spec/unit/ipaddress6_spec.rb
	spec/unit/lsbdistcodename_spec.rb
	spec/unit/lsbdistdescription_spec.rb
	spec/unit/lsbdistid_spec.rb
	spec/unit/lsbdistrelease_spec.rb
	spec/unit/lsbrelease_spec.rb
	spec/unit/macaddress_spec.rb
	spec/unit/memory_spec.rb
	spec/unit/operatingsystem_spec.rb
	spec/unit/operatingsystemrelease_spec.rb
	spec/unit/physicalprocessorcount_spec.rb
	spec/unit/processor_spec.rb
	spec/unit/selinux_spec.rb
	spec/unit/uptime_spec.rb
	spec/unit/util/collection_spec.rb
	spec/unit/util/config_spec.rb
	spec/unit/util/confine_spec.rb
	spec/unit/util/ec2_spec.rb
	spec/unit/util/fact_spec.rb
	spec/unit/util/ip_spec.rb
	spec/unit/util/loader_spec.rb
	spec/unit/util/macaddress_spec.rb
	spec/unit/util/macosx_spec.rb
	spec/unit/util/manufacturer_spec.rb
	spec/unit/util/processor_spec.rb
	spec/unit/util/registry_spec.rb
	spec/unit/util/resolution_spec.rb
	spec/unit/util/uptime_spec.rb
	spec/unit/util/virtual_spec.rb
	spec/unit/util/vlans_spec.rb
	spec/unit/util/wmi_spec.rb
	spec/unit/util/xendomains_spec.rb
	spec/unit/virtual_spec.rb
Merge branch '1.7.x'

* 1.7.x:
  (#11612) Add support for processorX facts on HP-UX
  Revert "Merge pull request #202 from hkenney/ticket/master/3226_strip_whitespace_from_fact"
  Revert "Merge pull request #208 from hkenney/ticket/master/14469_strip_whitespace_from_frozen_strings"
  Revert "Merge pull request #204 from jeffweiss/ticket/master/11466_remove_duplicate_memorytotal_fact"
  Revert "Merge pull request #205 from jeffweiss/ticket/master/12147_remove_iphostnumber_fact"
  Update lib/facter/version.rb for 1.6.14

Conflicts:
	CHANGELOG
	lib/facter/util/config.rb
	lib/facter/version.rb
	spec/unit/util/config_spec.rb
(Maint) Properly mock SunOS in test for manufacturer

Previously this test did not properly mock the kernl and hardwareisa
facts, which caused it to actually run the code on solaris. Having the
code actually run on solaris made it return an unexpected value and fail
the test.

This changes the mocking and should cause the test to start passing on
solaris.
(#17493) Safer handling of EC2 'open' calls

Previously, when facter (and therefore) facter was run on an openstack
node, the metadata method did not protect against the 'open' method from
raising exceptions. Since we don't know ahead of time what the name of
the metadata ec2 fact(s) are, we have to add a rescue block outside of
the setcode block. If an exception occurs, we warn, similar to how
facter's built-in resolution mechanism warns about exceptions.

Previously, the ec2_userdata fact performed the 'open' call outside of
the setcode block, and only rescued one type of exception. This commit
moves the 'open' call into the setcode block, which automatically
rescues and warns if needed.

As a result of this change, the ec2_userdata fact is not evaluated until
actually requested, which simplifies the tests for the ec2 metadata
fact(s).

Based on code from Eric Sorenson <eric0@puppetlabs.com>
(#17493) Merge rescue blocks

There was no difference in behavior between the two rescue blocks, so
this commit merges them together.

Also some of the tests were expecting an exception to not occur, in
which case it's just better to execute the code directly.
Merge branch 'ticket/1.6.x/17493_rescue_metadata_open' into 1.6.x

* ticket/1.6.x/17493_rescue_metadata_open:
  (#17493) Merge rescue blocks
  (#17493) Safer handling of EC2 'open' calls
Merge remote-tracking branch 'upstream/1.6.x' into 1.7.x

* upstream/1.6.x:
  (#17493) Merge rescue blocks
  (#17493) Safer handling of EC2 'open' calls

Conflicts:
	spec/unit/ec2_spec.rb
Update ips ruby libdir to use sitelibdir instead of rubylibdir

Signed-off-by: Moses Mendoza <moses@puppetlabs.com>
Turn on IPS building for facter
install.rb doesn't support sbindir, so remove it from ips rules

Signed-off-by: Moses Mendoza <moses@puppetlabs.com>
Merge pull request #353 from MosesMendoza/maint/1.6.x/ips_fixes

Maint/1.6.x/ips fixes
Merge remote-tracking branch 'upstream/1.6.x' into 1.7.x

* upstream/1.6.x:
  install.rb doesn't support sbindir, so remove it from ips rules
  Turn on IPS building for facter
  Update ips ruby libdir to use sitelibdir instead of rubylibdir