~avishai-ish-shalom/cloud-init/chef-refactor

Viewing all changes in revision 811.

  • Committer: Scott Moser
  • Date: 2013-04-17 17:53:47 UTC
  • mfrom: (805.2.1 cloud-init)
  • Revision ID: smoser@brickies.net-20130417175347-gz27ootivpd44dfp
Handle namespacing issues in merger.

Move from using the inbuilt type names (str, dict) as module names
which is a bad thing to use it appears due to naming conflicts
in the __init__ module and reduce the chances of these conflicts
by enforcing a m_ prefix for merging modules.

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: