Don't keep Gemfile.lock checked in.
Add acceptance test for report processing
Add vendoring system into puppet

(Revert "Revert "Merge pull request #1542 from hlindberg/vendor"")

This reverts commit 546dac12386865c00c172ba2e7b3f6f747434428, which had
reverted the original commit adding vendoring support. We now need it.
Fix installation of vendored libs

Vendored libs were getting the path component 'lib' removed when only the
leading 'lib' should be removed.
Vendor safe_yaml 0.9.2
Add acceptance test for report processing

This replaces a test in the old "unit" suite that was broken but testing dead
code.
Add vendoring system into puppet

This adds support to Puppet for vendoring libraries.
Fix installation of vendored libs

Vendored libs were getting the path component 'lib' removed when only the
leading 'lib' should be removed.
Vendor safe_yaml 0.9.2
(#20584) Only deserialize expected objects from YAML

Puppet no longer allows the base YAML library to deserialize arbitrary
objects. By using the safe_yaml package, we deserialize only primitive data
structures. The remainder of the deserialization process is now unified
between YAML and PSON. This code will explicitly create only the expected
objects from the primitive data types.

As a side effect of this change the code for REST indirections now allows
specialized deserialization routines per method. The save method now returns
nil by default, and is only overridden in a couple of cases where Puppet was
using the return value to preserve previous behavior.
(#20584) Only deserialize expected objects from YAML

Puppet no longer allows the base YAML library to deserialize arbitrary
objects. By using the safe_yaml package, we deserialize only primitive data
structures. The remainder of the deserialization process is now unified
between YAML and PSON. This code will explicitly create only the expected
objects from the primitive data types.

As a side effect of this change the code for REST indirections now allows
specialized deserialization routines per method. The save method now returns
nil by default, and is only overridden in a couple of cases where Puppet was
using the return value to preserve previous behavior.
clean up docs for new parser functions
(#20383) Provide location of duplicate resource in error

Commit ac83f85 cleaned up Puppet::Error and extracted file and line
presentation into a mixin. However the DuplicateResourceError exception
was relying on that behavior, and when the behavior was extracted the
location of the duplicate resource was lost.

This commit mixes in the ExternalFileError mixin and passes the file
line and number to the exception so that the duplicate resource location
can be displayed.

Thanks to Richard Clamp <richardc@unixbeard.net> for finding the
original error and providing the base for this fix.
Merge branch '20383-duplicate_resource_error_location' into stable
Remove acceptance test for yaml parsing that was no longer valid
Improve CVE 2013 1654 SSLv2 Downgrade Master test

Previously we were only checking for the applicability of the master
(since we're testing the master), but we run the check from an agent.
This ensures the agent we run the check from has the necessary openssl
client for the test.

Signed-off-by: Justin Stoller <justin@puppetlabs.com>
(packaging) Update build_defaults to remove EOL platforms (natty, f15, f16).
(packaging) Update debian build-depends to be ruby1.8 so that the shebang is correct after install and ruby1.9.1 isn't used on newer debians.
[packaging] Update mocks for rpmbuilder mock format

The Puppet Labs mocks created by rpmbuilder have assumed a new format, pl-el-*
vs el-*, in order to avoid overwriting the configurations supplied by the mock
package. This commit updates the mocks in puppet to reflect the new standard,
so that we can continue to build packages with builders created with the
rpmbuilder module. It also removes the "rc_mocks", which was deprecated in the
packaging repo some time ago and are no longer used.

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

Conflicts:
	ext/build_defaults.yaml
Merge pull request #1696 from Sharpie/21028-document-future-parser-functions

clean up docs for new parser functions (backport)