HomePhorge

Merge remote-tracking branch 'remotes/lak/tickets/next/7118…
3c22e770625fUnpublished

Unpublished Commit · Learn More

Repository Importing: This repository is still importing.

Description

Merge remote-tracking branch 'remotes/lak/tickets/next/7118-summaries_for_all_faces' into 2.7.x

Fix conflicts due to version drift in:
lib/puppet/face/certificate.rb
lib/puppet/face/facts.rb
lib/puppet/face/node.rb
lib/puppet/face/secret_agent.rb
spec/lib/puppet/face/basetest.rb
spec/unit/face/help_spec.rb

Reviewed-By: Markus Roberts <markus@puppetlabs.com>

Event Timeline

Daniel Pittman <daniel@puppetlabs.com> committed rPU3c22e770625f: Merge remote-tracking branch 'remotes/lak/tickets/next/7118… (authored by Daniel Pittman <daniel@puppetlabs.com>).Apr 22 2011, 1:33 AM