Change one test to use the new confine syntax.
Re-enable this test to work on windows

The reason the test wasn't working and why it was changed to not execute
was that the test environment was mis-configured (the hostname of the
windows agent was different from what the puppet master knew as that
machine's name).
Merge pull request #799 from zaphod42/maint/master/enable-test-for-node-and-enc-on-windows

Re-enable this test to work on windows
Merge pull request #734 from mkincaid/confines

Update acceptance tests to use confine instead of skip_test loops
(maint) Make 3.0.x work with rspec-puppet

Without this patch applied Hiera tries to load a file that does not
exist when running spec tests with rspec-puppet.

The error message without this patch looks like:

      1) ntp test platform specific resources for operating system centos should allow package ensure to be overridden
         Failure/Error: subject.should contain_package('ntp').with_ensure('latest')
         Puppet::Error:
           Puppet::Parser::AST::Resource failed with error RuntimeError: Config file /dev/null/hiera.yaml not found at line 3 on node maynard.puppetlab
    s.lan
         # /vagrant/src/hiera/lib/hiera/config.rb:17:in `load'

This patch fixes the problem by setting the hiera_config setting to /dev/null
explicitly in the TestHelper class.  This is a file that should exist which
will avoid the exception coming out of the hiera library.
Merge pull request #812 from jeffmccune/maint/master/intialize_hiera_for_rspec_puppet

(maint) Make 3.0.x work with rspec-puppet
Merge remote-tracking branch 'upstream/2.7.x' into 3.x

* upstream/2.7.x:
  (maint) Add mailmap to identify contributors
  Updating CHANGELOG, conf/redhat/puppet.spec for puppet 2.7.15rc4
  Remove EL-related test changes from this commit.
  Revert changes to symbolic_modes.rb -- this test should indeed be pending (it should eventually work on Windows).
  Update acceptance tests to use confine instead of skip_test loops

Conflicts:
	CHANGELOG
	conf/redhat/puppet.spec
Merge remote-tracking branch 'upstream/3.x'

* upstream/3.x: (38 commits)
  (maint) Add mailmap to identify contributors
  Updating CHANGELOG, conf/redhat/puppet.spec for 3.0.0rc3
  Updating CHANGELOG, conf/redhat/puppet.spec for puppet 2.7.15rc4
  (#14761) Add boot, reboot to excludes list for redhat provider
  (maint) Disable upstart spec test on windows
  (#14615) Final stub fixes for the tests.
  (#14615) Fix provider spec tests to work on non gentoo systems
  maint: Make it easier to test the service provider
  (Maint) Close filehandles after read in upstart
  (Maint) Fix upstart provider to work on Ruby 1.9.3
  Update CHANGELOG, conf/redhat/puppet.spec for 2.7.15rc3
  Update redhat.spec dependency to include hiera-puppet
  Update puppet gem dependencies
  Update redhat init scripts to use `puppet (agent|queue|master)`
  (#14297) Don't remove tty1 or rsyslog during upstart acceptance
  (#14297) Define agent in upstart acceptance test
  (#14297) Update upstart provider acceptance tests
  (#14297) Clean up upstart provider and tests
  (#14343) Test cases for more forms of variable lookup
  (#14297) Add acceptance test for upstart provider
  ...
(maint) Update README.md w/ min Facter ver

As of Puppet 3.0.0, the minimum version of Facter required is 2.0.0.
This commit updates the documentation in README.md.
Merge remote-tracking branch 'upstream/2.7.x' into 3.x

* upstream/2.7.x:
  Updated manpages, CHANGELOG, puppet.spec, puppet.rb for 2.7.16rc1.
  (#8858) Explicitly set SSL peer verification mode.
  Test SSL setup code, not our stubbing of it.
  (#14723) Fix http report description

Conflicts in man pages were resolved by taking the 3.x version of the
pages.

Conflicts:
	CHANGELOG
	conf/redhat/puppet.spec
	lib/puppet.rb
	man/man5/puppet.conf.5
	man/man8/filebucket.8
	man/man8/pi.8
	man/man8/puppet-agent.8
	man/man8/puppet-apply.8
	man/man8/puppet-ca.8
	man/man8/puppet-catalog.8
	man/man8/puppet-cert.8
	man/man8/puppet-certificate.8
	man/man8/puppet-certificate_request.8
	man/man8/puppet-certificate_revocation_list.8
	man/man8/puppet-config.8
	man/man8/puppet-describe.8
	man/man8/puppet-device.8
	man/man8/puppet-doc.8
	man/man8/puppet-facts.8
	man/man8/puppet-file.8
	man/man8/puppet-filebucket.8
	man/man8/puppet-help.8
	man/man8/puppet-inspect.8
	man/man8/puppet-instrumentation_data.8
	man/man8/puppet-instrumentation_listener.8
	man/man8/puppet-instrumentation_probe.8
	man/man8/puppet-key.8
	man/man8/puppet-kick.8
	man/man8/puppet-man.8
	man/man8/puppet-master.8
	man/man8/puppet-module.8
	man/man8/puppet-node.8
	man/man8/puppet-parser.8
	man/man8/puppet-plugin.8
	man/man8/puppet-queue.8
	man/man8/puppet-report.8
	man/man8/puppet-resource.8
	man/man8/puppet-resource_type.8
	man/man8/puppet-secret_agent.8
	man/man8/puppet-status.8
	man/man8/puppet.8
	man/man8/puppetca.8
	man/man8/puppetd.8
	man/man8/puppetdoc.8
	man/man8/puppetmasterd.8
	man/man8/puppetqd.8
	man/man8/puppetrun.8
	man/man8/ralsh.8
	tasks/rake/gem.rake
Merge remote-tracking branch 'upstream/3.x'

* upstream/3.x:
  Updated manpages, CHANGELOG, puppet.spec, puppet.rb for 2.7.16rc1.
  (maint) Update README.md w/ min Facter ver
  (#8858) Explicitly set SSL peer verification mode.
  Test SSL setup code, not our stubbing of it.
  (#14723) Fix http report description
Make Puppet's gem package task the same name as other Puppetlabs' projects
Merge pull request #853 from justinstoller/maint/2.7.x/normalize_gem_task_name

(maint) Make Puppet's gem package task the same name as other Puppetlabs' projects
(#14598) Add SSL support for forge interaction

This patch turn on SSL support when an HTTPS url is provided, and also changes
the default URL to https://forge.puppetlabs.com so that now all interaction is
done via SSL.

As not all Ruby setups on weird operating systems are proven to work, effort
was spent in making sure validation errors are captured and returned as a
meaningful error to the user. This was also captured as a simple acceptance
test by testing against a self-signed certificate (in our case, a puppet
master).

The forge error handling in Puppet::Forge::Repository was changed to return
a new set of exceptions specific to the Puppet::Forge API set, so they can
be captured by consumers and displayed. This also helps a lot with test mocking
and tests have been changed accordingly.

To reflect the new error handling in Puppet::Forge::Repository the search face
was changed to capture exceptions and hand them off to the rendering parts as
data in a hash, to mimic how the rest of the puppet/face/module components
work.

All the existing acceptance tests were changed to now test against SSL, and
existing unit tests were also changed to reflect changes herein. New tests were
added for Puppet::ModuleTool::Applications::Searcher as previously this had no
coverage.