diff options
| author | Daniel Pittman <daniel@puppetlabs.com> | 2011-04-21 16:33:59 -0700 |
|---|---|---|
| committer | Daniel Pittman <daniel@puppetlabs.com> | 2011-04-21 16:33:59 -0700 |
| commit | 3c22e770625f3cc788b0d138c8101e259a534736 (patch) | |
| tree | a5421861cc9472412d034f66e94b30dbe60a7705 /lib/puppet/node | |
| parent | 681edda370ec3d33aca0ca61864ec4352cafe567 (diff) | |
| parent | ff08ba2abc8a59caa2bae0cde0a84ded99337e1c (diff) | |
| download | puppet-3c22e770625f3cc788b0d138c8101e259a534736.tar.gz puppet-3c22e770625f3cc788b0d138c8101e259a534736.tar.xz puppet-3c22e770625f3cc788b0d138c8101e259a534736.zip | |
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>
Diffstat (limited to 'lib/puppet/node')
0 files changed, 0 insertions, 0 deletions