puppetlabs/puppet — pull request #794 by zaphod42 (2012-05-16 20:58:15+00:00)
Title: Bug/2.7.x/8174 incorrect warning about deprecated scoping

Ed Brannin reported that the previous fix for bug #8174 didn't work with defined resource types. This pull request adds tests for the the case of using `define` and cherry picks two commits that occurred on the master branch which solve the issue.

The two cherry picked commits stop the topscope from being re-assigned after the nodes are evaluated.