(#15001) Return correct value for ipaddress6 for Fedora 17+
Merge branch 'pull-401' into 1.6.x

This closes GH-401
Merge branch '1.6.x' into 1.7.x
Merge branch '1.7.x'

Conflicts:
	lib/facter/util/ip.rb
(maint) Update Gemfile to work well on windows

Without this patch applied, the following issues are encountered trying
to get Facter working in a development environment on Windows.  This is
with Ruby 1.9.3 and Bundler 1.2.4.

First, the runtime provided by rubyinstaller.org is unable to verify the
SSL certificate of rubygems.org.  For Windows, we work around the
problem by allowing the user to specify an alternate gem source using
the GEM_SOURCE environment variable.  For example,
`$ENV:GEM_SOURCE="http://rubygems.org"`.

Next, `bundle exec facter --version` does not work because Facter 1.7
depends on the win32-dir gem and this dependency is not specified in the
Gemfile.  This patch addresses the problem by specifying the dependency
on win32-dir.
(maint) Clean up require => false in Gemfile

This is just a maintenance patch to clean up all of the `:require =>
false` entries in the bundler Gemfile.  These statements prevent Bundler
from loading the gem libraries when running `bundle exec` or
`Bundler.setup`.  We don't run `Bundler.setup` in the code, so the
libraries will only be pre-loaded when run through `bundle exec` which
is by design.

This does not appear to cause any problems with the spec examples.
Merge branch 'maint/1.7.x/bundler_on_windows' into 1.7.x

* maint/1.7.x/bundler_on_windows:
  (maint) Clean up require => false in Gemfile
  (maint) Update Gemfile to work well on windows
Merge branch '1.7.x'

* 1.7.x:
  (maint) Clean up require => false in Gemfile
  (maint) Update Gemfile to work well on windows
(#16948) Fix hardwaremodel fact on windows 32 bit

Without this patch applied the hardwaremodel fact will return 'x64' when
a 32 bit operating system is running inside of a 64 bit CPU.  This is a
problem because it is inconsistent with the way Facter operates on other
platforms where the behavior is to inspect the operating system rather
than the CPU itself.

This patch fixes the problem by checking the AddressWidth attribute
which will report 32 when a 32 bit OS is running on a 64 bit CPU.  The
attribute will report 64 when a 64 bit OS is running.
Merge branch 'fix/1.7.x/16948_windows_hardwaremodel' into 1.7.x

* fix/1.7.x/16948_windows_hardwaremodel:
  (#16948) Fix hardwaremodel fact on windows 32 bit

Reviewed-by: Patrick Carlisle <patrick@puppetlabs.com>
Merge branch '1.7.x'

* 1.7.x:
  (#16948) Fix hardwaremodel fact on windows 32 bit
(maint) centralize system fact stubbing in virtual specs

The specs for the virtual fact on various platforms were duplicating
method stubs for the same fact. This commit removes the stub duplication
and puts the stubs into `before` blocks.
Merge branch 'maint-centralize_virtual_fact_stubs' into 1.6.x
Merge branch '1.6.x' into 1.7.x

Conflicts:
	spec/unit/virtual_spec.rb
Merge branch '1.7.x'
(maint) Update link to the contributor license agreement

New link: http://links.puppetlabs.com/cla as per Eric.

[ci skip]
Update lib/facter/version.rb for 1.6.18
Merge branch 'release/1.6.18' into 1.6.x

* release/1.6.18:
  Update lib/facter/version.rb for 1.6.18
Merge branch '1.6.x' into 1.7.x

* 1.6.x:
  Update lib/facter/version.rb for 1.6.18
Merge branch '1.7.x'

* 1.7.x:
  Update lib/facter/version.rb for 1.6.18