index
:
vyos-cloud-init.git
circinus
crux
current
equuleus
mergify/bp/circinus/pr-78
mergify/bp/circinus/pr-85
mergify/bp/sagitta/pr-78
sagitta
(mirror of https://github.com/vyos/vyos-cloud-init.git)
summary
refs
log
tree
commit
diff
log msg
author
committer
range
path:
root
/
cloudinit
/
mergers
/
__init__.py
Age
Commit message (
Expand
)
Author
2020-09-16
cloudinit: remove unused LOG variables (#574)
Daniel Watkins
2020-01-21
Start removing dependency on six (#178)
Daniel Watkins
2016-12-22
LICENSE: Allow dual licensing GPL-3 or Apache 2.0
Jon Grimm
2015-01-21
Largely merge lp:~harlowja/cloud-init/py2-3 albeit manually because it seemed
Barry Warsaw
2014-09-02
Remove/adjust the verbose 'failed at attempted import of' log
Joshua Harlow
2014-07-15
Remove some of the more useless debug logs
Joshua Harlow
2013-05-03
More merging adjustments.
Joshua Harlow
2013-04-22
Continue working on merging.
Joshua Harlow
2013-04-18
Remove str merging for now.
Joshua Harlow
2013-04-17
Handle namespacing issues.
Joshua Harlow
2013-03-07
more pep8/pylint. all clean now
Scott Moser
2013-03-07
fix pep8 and pylint
Scott Moser
2013-03-07
change default merge type
Scott Moser
2013-03-06
Add some nice docs on what this is.
Joshua Harlow
2013-03-06
Continue working on merging code.
Joshua Harlow
2013-03-05
Add in a bunch of changes and tests.
Joshua Harlow
2012-11-22
Allow mergers to take options.
Joshua Harlow
2012-11-20
Start allowing different merging types to be applied
Joshua Harlow