diff options
| author | Luke Kanies <luke@reductivelabs.com> | 2009-12-21 16:23:44 -0800 |
|---|---|---|
| committer | Luke Kanies <luke@reductivelabs.com> | 2009-12-21 16:23:44 -0800 |
| commit | 740fd6b301af89ab3aad89bca183ad1fcdc24ac4 (patch) | |
| tree | f34617a229509c373d28d67abb453e7ae2136c39 /ext/regexp_nodes/classes | |
| parent | 8971d8beae2c409f9052f27c3f80ad3bdfff4de2 (diff) | |
| parent | 4a06379f8770c164e42bcc410d874076c6e95f24 (diff) | |
| download | puppet-740fd6b301af89ab3aad89bca183ad1fcdc24ac4.tar.gz puppet-740fd6b301af89ab3aad89bca183ad1fcdc24ac4.tar.xz puppet-740fd6b301af89ab3aad89bca183ad1fcdc24ac4.zip | |
Merge branch '0.25.x'
Conflicts:
lib/puppet/agent.rb
lib/puppet/application/puppetd.rb
lib/puppet/parser/ast/leaf.rb
lib/puppet/util/rdoc/parser.rb
Diffstat (limited to 'ext/regexp_nodes/classes')
| -rw-r--r-- | ext/regexp_nodes/classes/databases | 2 | ||||
| -rw-r--r-- | ext/regexp_nodes/classes/webservers | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/ext/regexp_nodes/classes/databases b/ext/regexp_nodes/classes/databases new file mode 100644 index 000000000..2dd052b0c --- /dev/null +++ b/ext/regexp_nodes/classes/databases @@ -0,0 +1,2 @@ +db\d{2} +mysql diff --git a/ext/regexp_nodes/classes/webservers b/ext/regexp_nodes/classes/webservers new file mode 100644 index 000000000..1df02bcab --- /dev/null +++ b/ext/regexp_nodes/classes/webservers @@ -0,0 +1,2 @@ +^(web|www) +leterel |