summaryrefslogtreecommitdiff
path: root/cloudinit/mergers/m_str.py
Commit message (Expand)AuthorAgeFilesLines
* Refactor: Drop inheritance from object (#1728)Alberto Contreras2022-09-141-1/+1
* Adopt Black and isort (SC-700) (#1157)James Falcon2021-12-151-2/+3
* Start removing dependency on six (#178)Daniel Watkins2020-01-211-7/+2
* LICENSE: Allow dual licensing GPL-3 or Apache 2.0Jon Grimm2016-12-221-14/+3
* Largely merge lp:~harlowja/cloud-init/py2-3 albeit manually because it seemedBarry Warsaw2015-01-211-4/+6
* More merging adjustments.Joshua Harlow2013-05-031-0/+44
* Remove str merging for now.Joshua Harlow2013-04-181-39/+0
* Pull from head and a couple more tweaks.Joshua Harlow2013-04-181-1/+1
* Handle namespacing issues.Joshua Harlow2013-04-171-0/+39