[Pkg-puppet-devel] [SCM] Puppet packaging for Debian branch, upstream, updated. 2.6.5-303-gfcfa26a

[Nick Lewis]

The following commit has been merged in the upstream branch:
commit 43c79b744d0af0c5a1221addc74cc36eb68071a6
Merge: 7cf291944ad28532ccf31393e36ecf4bcd805868 2ecf91367c911a87dc5680108222dcc48ecca888
Author: Nick Lewis <nick at puppetlabs.com>
Date:   Mon Feb 28 14:16:50 2011 -0800

    Merge branch 'maint/2.6.next/revert-5935' into 2.6.next

diff --combined lib/puppet/parser/grammar.ra
index 5e25b9d,98b8cfc..af0ab18
--- a/lib/puppet/parser/grammar.ra
+++ b/lib/puppet/parser/grammar.ra
@@@ -139,9 -139,6 +139,6 @@@ funcvalues:       namestrin
  # This is *almost* an rvalue, but I couldn't get a full
  # rvalue to work without scads of shift/reduce conflicts.
  namestring:       name
-   | MINUS namestring =UMINUS {
-     result = ast AST::Minus, :value => val[1]
-   }
    | variable
    | type
    | boolean
@@@ -874,3 -871,6 +871,3 @@@ require 'puppet/parser/parser_support
  # Local Variables:
  # mode: ruby
  # End:
 -
 -# $Id$
 -

-- 
Puppet packaging for Debian