puppetlabs/puppetdb — pull request #264 by cprice-puppet (2012-08-23 18:28:23+00:00)
Title: Bug/master/duplicate collected resources

commit b8f4d0cb818b797af7fe0597eeb87857a0b211b4
Author: Chris Price
Date: Wed Aug 22 19:18:33 2012 -0700

Duplicate collected resources should cause a failure

Prior to this commit, the puppetdb resource terminus
was not setting a value for "collector_id" on collected
resources. This field is used by puppet to detect
duplicate resources (exported by multiple nodes) and
cause a run to fail.

This commit adds code to set the collector id based on
node name + resource title + resource type, and adds
tests to verify that a puppet run will fail if it
collects duplicate instances of the same resource from
different exporters.

commit f62e725b748216b225e23c3bc9e22c0f6ac63b5d
Author: Chris Price
Date: Wed Aug 22 19:17:42 2012 -0700

Fixes to allow acceptance to be run against source

In one of our recent refactors, we somehow lost the
code for installing puppetdb and the termini via rake.
This commit adds those back in so that it is possible
to run acceptance tests from source again.