Age | Commit message (Collapse) | Author | |
---|---|---|---|
2015-01-21 | Largely merge lp:~harlowja/cloud-init/py2-3 albeit manually because it seemed | Barry Warsaw | |
to be behind trunk. `tox -e py27` passes full test suite. Now to work on replacing mocker. | |||
2013-05-03 | More merging adjustments. | Joshua Harlow | |
Looks like this should be in pretty good shape and has passed some of the basic backwards compat. merging tests that I added. | |||
2013-04-18 | Remove str merging for now. | Joshua Harlow | |
2013-04-18 | Pull from head and a couple more tweaks. | Joshua Harlow | |
2013-04-17 | Handle namespacing issues. | Joshua Harlow | |
Move from using the inbuilt type names 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. |