← Back to branch summary

~lynxman/ubuntu/natty/mcollective/natty-upstart

« back to all changes in this revision

Viewing changes to plugins/mcollective/agent/rpcutil.ddl

  • Committer: Bazaar Package Importer
  • Author(s): Dustin Kirkland
  • Date: 2011-02-17 13:07:47 UTC
  • mfrom: (1.1.1 upstream)
  • Revision ID: james.westby@ubuntu.com-20110217130747-pxvkrl6up9znj8ft
Tags: 1.0.1-0ubuntu1
* Merge new upstream release
* debian/mcollective.install: drop unneeded /etc/init.d (we use upstart)
* debian/copyright: use Apache 2.0 header and point to common-license
  file, per Lintian

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugins/mcollective/agent/rpcutil.ddl
4
4
            :license     => "Apache License, Version 2.0",
5
5
            :version     => "1.0",
6
6
            :url         => "http://marionette-collective.org/",
7
 
            :timeout     => 3
 
7
            :timeout     => 10
8
8
 
9
9
action "inventory", :description => "System Inventory" do
10
10
    display :always
33
33
         :prompt      => "The name of the fact",
34
34
         :description => "The fact to retrieve",
35
35
         :type        => :string,
36
 
         :validation  => '^[a-z_0-9]+$',
 
36
         :validation  => '^[a-z_0-9\-]+$',
37
37
         :optional    => false,
38
38
         :maxlength    => 40
39
39