Update CHANGELOG, lib/facter.rb, conf/redhat/facter.spec for 1.6.11rc1
Add build-requires of ruby-rdoc for manpage generation

Without a BuildRequires of ruby-rdoc, if we remove the --no-rdoc flag from
install.rb, the manpages will still not be generated, which will cause the
build to fail, because the %files section lists manpages. Adding a
BuildRequires of ruby-rdoc and removing the --no-rdoc flag from install.rb will
allow manpage generation for packaging.
Merge pull request #283 from haus/maint/1.6.x/fix_facter_man_generation

Add build-requires of ruby-rdoc for manpage generation
(#11640) Added support for new OpenStack MAC addresses

OpenStack changed the MAC address prefix they use to address an issues with libvirt

OpenStack bug: https://bugs.launchpad.net/nova/+bug/921838
Update CHANGELOG, conf/redhat/facter.spec for 1.6.11
Update a facter build-requires for f17
Merge pull request #285 from MosesMendoza/maint/1.6.x/Fix_ruby_rdoc_build_requires_for_f17

Update a facter build-requires for f17
Update facter redhat spec for fedora 17

This commit adds support for fedora 17/ruby 1.9
which uses vendorlibdir instead of sitelibdir.

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

Update facter redhat spec for fedora 17
(#15291) Add Vendor tag to Facter spec file

Previously the spec file had no Vendor tag, which left it undefined. This
commit adds a Vendor tag that references the _host_vendor macro, so that it can
be easily set to 'Puppet Labs' internally and customized by users easily. The
Vendor tag makes it easier for users to tell where the package came from.
Retabbed conf/redhat/facter.spec to lineup tag contents.
Merge pull request #288 from haus/ticket/1.6.x/15291_add_vendor_tag_to_spec

(#15291) Add Vendor tag to Facter spec file
(#15464) Make contributing easy via bundle Gemfile

Without this patch the process of figuring out how to quickly set up a
development and testing environment for the Puppet _application_ (not a
gem library) is unnecessarily complicated.

This patch addresses the problem by providing a Bundler compatible
Gemfile that specifies all of the Gem dependencies for the Puppet 2.7
application.

Puppet contributors can now easily get a working development and testing
environment using this sequence of commands:

    $ git clone --branch 2.7.x git://github.com/puppetlabs/puppet.git
    $ cd puppet/
    $ bundle install # Install all required dependencies
    $ rspec

The .noexec.yaml file excludes the `rake` command so that the Gemfile
doesn't raise an exception if the `rubygems-bundler` Gem is installed
and automatically running `bundle exec` for us.

The Gemfile.lock contains the exact dependency versions.  This file is
included in the version control system because we're treating Puppet as
an application rather than a library.
Merge branch 'ticket/1.6.x/11640_openstack_mac_address_change' of https://github.com/aabrahamowicz/facter into 1.6.x
(#15464) Make Facter.version settable via Facter.version=

Without this patch applied the version string of Facter is dynamically
set from the `git describe` tag in the Rakefile using monkey patching.

This is problematic because this causes a constant to be re-defined
which issues a warning in Ruby.

This patch fixes the problem by implementing the Facter.version= module
method.  The Rakefile will now set the Facter version by using `require
'puppet/version'` and calling `Facter.version = %x{git describe ...}`

Using a module method also has the benefit of making it easier to
intercept and mock Facter version specific behavior.

From this point forward, the method Facter.version should but used to
obtain the version string instead of the constant Facter::FACTERVERSION.
Merge branch 'ticket/1.6.x/15464_a_gemfile_would_improve_contributor_on-boarding' into 1.6.x

* ticket/1.6.x/15464_a_gemfile_would_improve_contributor_on-boarding:
  (#15464) Make Facter.version settable via Facter.version=
  (#15464) Make contributing easy via bundle Gemfile
Merge branch '1.6.x' into 2.x

* 1.6.x:
  (#15464) Make Facter.version settable via Facter.version=
  (#15464) Make contributing easy via bundle Gemfile
  Retabbed conf/redhat/facter.spec to lineup tag contents.
  (#15291) Add Vendor tag to Facter spec file
  Update facter redhat spec for fedora 17
  Update a facter build-requires for f17
  Update CHANGELOG, conf/redhat/facter.spec for 1.6.11
  (#11640) Added support for new OpenStack MAC addresses
  Add build-requires of ruby-rdoc for manpage generation
  Update CHANGELOG, lib/facter.rb, conf/redhat/facter.spec for 1.6.11rc1

Conflicts:
	CHANGELOG
	conf/redhat/facter.spec
	lib/facter.rb
	lib/facter/util/ec2.rb
(Maint) Fix Facter version to be 2.0.0-rc4

During the merge-up from 1.6.x I accidentally set the Facter version to
be 1.6.11 in the 2.x branch.  This is a problem because Puppet 3.x
currently requires Facter 2.x and fails hard if the version is
mis-reported.

This patch fixes the problem by setting the hard-coded version of
Facter.version to be 2.0.0-rc4 which is the last known explicitly set
version in the 2.x branch.
Merge branch 'fix/2.x/version_failures' into 2.x

* fix/2.x/version_failures:
  (Maint) Fix Facter version to be 2.0.0-rc4
Fixup redhat spec file for f17

This commit fixes up the redhat facter.spec file,
adding in some missing fedora 17 changes that were
probably lost in a merge-up. The os-dependent
definition of facter_libdir is replaced, and the
mandir file-listing is added. The last changelog
entry is removed, which is out of chronological
order (which prevents rpm building). It also removes
an errant conflict marker.

Signed-off-by: Moses Mendoza <moses@puppetlabs.com>