summaryrefslogtreecommitdiff
path: root/cloudinit/mergers/m_str.py
AgeCommit message (Expand)Author
2015-01-21Largely merge lp:~harlowja/cloud-init/py2-3 albeit manually because it seemedBarry Warsaw
2013-05-03More merging adjustments.Joshua Harlow
2013-04-18Remove str merging for now.Joshua Harlow
2013-04-18Pull from head and a couple more tweaks.Joshua Harlow
2013-04-17Handle namespacing issues.Joshua Harlow