diff options
| author | Daniel Pittman <daniel@puppetlabs.com> | 2011-05-03 14:55:14 -0700 |
|---|---|---|
| committer | Daniel Pittman <daniel@puppetlabs.com> | 2011-05-03 14:55:14 -0700 |
| commit | b17b49c97380cd64e75ac5e2ef12fb939ae953bb (patch) | |
| tree | b285f8ae0a1c7359632e81f5b10655bb64145f36 /lib/puppet/interface | |
| parent | b7ba66c8ebd7d59de40188a70b4e6fa0ddd8d2ad (diff) | |
| parent | 5120a95830183fdb30fc178452bfc3e6f44605b7 (diff) | |
Merge branch 'bug/2.7.x/7276-return-value-from-plugin-download-is-not-user-friendly' into 2.7.x
Diffstat (limited to 'lib/puppet/interface')
| -rw-r--r-- | lib/puppet/interface/action.rb | 2 | ||||
| -rw-r--r-- | lib/puppet/interface/face_collection.rb | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/lib/puppet/interface/action.rb b/lib/puppet/interface/action.rb index 203d80827..d4cf23fce 100644 --- a/lib/puppet/interface/action.rb +++ b/lib/puppet/interface/action.rb @@ -3,6 +3,7 @@ require 'puppet/interface/documentation' require 'prettyprint' class Puppet::Interface::Action + extend Puppet::Interface::DocGen include Puppet::Interface::FullDocs def initialize(face, name, attrs = {}) @@ -44,6 +45,7 @@ class Puppet::Interface::Action ######################################################################## # Documentation... + attr_doc :returns def synopsis output = PrettyPrint.format do |s| s.text("puppet #{@face.name}") diff --git a/lib/puppet/interface/face_collection.rb b/lib/puppet/interface/face_collection.rb index baa424692..12d3c56b1 100644 --- a/lib/puppet/interface/face_collection.rb +++ b/lib/puppet/interface/face_collection.rb @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- require 'puppet/interface' module Puppet::Interface::FaceCollection |