diff options
| author | Pieter van de Bruggen <pieter@puppetlabs.com> | 2011-05-17 14:50:40 -0700 |
|---|---|---|
| committer | Pieter van de Bruggen <pieter@puppetlabs.com> | 2011-05-17 14:50:40 -0700 |
| commit | f9e44f041b3fdc120b1c78554c35c83f7517152e (patch) | |
| tree | f5d4687277fff6fe697a92089f1fa9283dce1bb4 /lib/puppet/face | |
| parent | 99d437d2bbc2339f092304715ec562fbbcb0a50c (diff) | |
| parent | c8b294a0b0a1fc91a64c0a1ac3bab3b2aec92faf (diff) | |
Merge branch '2.7.x' into 2.7.next
Diffstat (limited to 'lib/puppet/face')
| -rw-r--r-- | lib/puppet/face/certificate.rb | 2 | ||||
| -rw-r--r-- | lib/puppet/face/resource.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/puppet/face/certificate.rb b/lib/puppet/face/certificate.rb index ee2b2873f..859946623 100644 --- a/lib/puppet/face/certificate.rb +++ b/lib/puppet/face/certificate.rb @@ -8,7 +8,7 @@ Puppet::Indirector::Face.define(:certificate, '0.0.1') do summary "Provide access to the CA for certificate management" description <<-EOT This face interacts with a local or remote Puppet certificate - authority. Currently, its behavior is not a full superset of puppet + authority. Currently, its behavior is not a full superset of puppet cert; specifically, it is unable to mimic puppet cert's "clean" option, and its "generate" action submits a CSR rather than creating a signed certificate. diff --git a/lib/puppet/face/resource.rb b/lib/puppet/face/resource.rb index ed6360888..87e587624 100644 --- a/lib/puppet/face/resource.rb +++ b/lib/puppet/face/resource.rb @@ -7,7 +7,7 @@ Puppet::Indirector::Face.define(:resource, '0.0.1') do summary "Interact directly with resources via the RAL, like ralsh" description <<-EOT This face provides a Ruby API with functionality similar to the puppet - resource (née ralsh) command line application. It is not intended to be + resource (originally ralsh) command line application. It is not intended to be used from the command line. EOT notes <<-EOT |