puppetlabs/puppet — pull request #3032 by jpartlow (2014-08-29 01:22:21+00:00)
Title: (WIP- do not merge) Feature/master/pup 3069 add defaultmanifest

This provides default_manifest and restrict_environment_manifest, and halts compilation if there is a conflict in manifest settings. It needs some integration tests and should not be merged just yet, but it is otherwise ready for review.