diff options
| author | luke <luke@980ebf18-57e1-0310-9a29-db15c13687c0> | 2007-05-17 22:08:54 +0000 |
|---|---|---|
| committer | luke <luke@980ebf18-57e1-0310-9a29-db15c13687c0> | 2007-05-17 22:08:54 +0000 |
| commit | ef1a4afc187026db1840073eb4bb4d587e4aa86f (patch) | |
| tree | 61ae99217ae7bb3ad7f19d199c688635201b9ce8 /lib/puppet/parser/grammar.ra | |
| parent | e8d560ea8242d99f5be51f9385c5045f46ee7015 (diff) | |
| download | puppet-ef1a4afc187026db1840073eb4bb4d587e4aa86f.tar.gz puppet-ef1a4afc187026db1840073eb4bb4d587e4aa86f.tar.xz puppet-ef1a4afc187026db1840073eb4bb4d587e4aa86f.zip | |
Fixing #568
git-svn-id: https://reductivelabs.com/svn/puppet/trunk@2524 980ebf18-57e1-0310-9a29-db15c13687c0
Diffstat (limited to 'lib/puppet/parser/grammar.ra')
| -rw-r--r-- | lib/puppet/parser/grammar.ra | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/lib/puppet/parser/grammar.ra b/lib/puppet/parser/grammar.ra index 6714afab8..c8130ccf0 100644 --- a/lib/puppet/parser/grammar.ra +++ b/lib/puppet/parser/grammar.ra @@ -556,7 +556,7 @@ argument: NAME EQUALS rvalue { } nodeparent: nil - | INHERITS nameordefault { + | INHERITS hostname { result = val[1] } @@ -565,7 +565,6 @@ classparent: nil result = val[1] } -nameordefault: NAME | DEFAULT classnameordefault: classname | DEFAULT variable: VARIABLE { |