diff options
author | Matt Robinson <matt@puppetlabs.com> | 2011-05-19 21:18:55 -0700 |
---|---|---|
committer | Matt Robinson <matt@puppetlabs.com> | 2011-05-19 21:18:55 -0700 |
commit | eeeab02fd97a625ec0e21ecd5d0ed7f0067027ef (patch) | |
tree | 704477b4d8c2b255707e65135b3bb0d10253e06c /lib/puppet/interface/documentation.rb | |
parent | be2f20899d76621db4cf574d074f0ae89777272e (diff) | |
parent | 99bf07e76bab47760b9eb3dc42f08582c568388f (diff) | |
download | puppet-eeeab02fd97a625ec0e21ecd5d0ed7f0067027ef.tar.gz puppet-eeeab02fd97a625ec0e21ecd5d0ed7f0067027ef.tar.xz puppet-eeeab02fd97a625ec0e21ecd5d0ed7f0067027ef.zip |
Merge branch '2.7.next' into 2.7.x
* 2.7.next: (42 commits)
(#6395) Add extpuppet help, eval, and interfaces
Adding a sleep state post starting master
maint: fix spec_helper inclusions again.
(#7523) Refactor the grammar to reduce duplication
(#7114) Fix specs for ssh authorized key parsed provider
(#7114) Target returns correct value
(#7114) Add integration tests for authorized_key
(#7114) Improve unit tests for ssh_authorized_key
(#7114) Improve value validation for authorized_key
(#7300) Fix instances method of mount provider
(#7259) Remove ActiveRecord requirement from indirector face spec
(#7259) Do not try to load all Terminus classes when configuring the Indirector
(#3836) External nodes should only capture stdout
Revert "(#7220) Add the ability to "inherit" options."
maint: sync 'authconfig' to 'rest_authconfig' setting
adding test for ticket 7139
(#7139) Accept '/' as a valid path in filesets
(#7300) Add specs for the mount provider
case seems needless here as there is only two opts, also the rest of the file seems to use if so this should make things more consistant
(#6845) Mount writes incorrect vfstab entries
...
Diffstat (limited to 'lib/puppet/interface/documentation.rb')
0 files changed, 0 insertions, 0 deletions