index
:
delta/cloud-init-git.git
22.4.x
23.1.x
archived/19.1
cla
d80d0fcc0
dependabot/pip/cryptography-3.2
dependabot/pip/cryptography-3.3.2
deps
docs/19.1
james-hotplug
main
master
oddbloke-travis-test
pr_holman_docs
quick-check
rtd-build
single-schema-validation
single-schema-validation-a-d
stable-18.4
stable-19.4
test_upgrade
tests
tests-wip
ubuntu/artful
ubuntu/bionic
ubuntu/bionic-22.4.x
ubuntu/bionic-23.1.x
ubuntu/cosmic
ubuntu/daily/bionic
ubuntu/daily/devel
ubuntu/daily/eoan
ubuntu/daily/focal
ubuntu/daily/groovy
ubuntu/daily/hirsute
ubuntu/daily/impish
ubuntu/daily/xenial
ubuntu/devel
ubuntu/devel-23.1.x
ubuntu/disco
ubuntu/eoan
ubuntu/focal
ubuntu/focal-22.4.x
ubuntu/focal-23.1.x
ubuntu/groovy
ubuntu/hirsute
ubuntu/impish
ubuntu/jammy
ubuntu/jammy-22.4.x
ubuntu/jammy-23.1.x
ubuntu/kinetic
ubuntu/kinetic-22.4.x
ubuntu/kinetic-23.1.x
ubuntu/lunar
ubuntu/lunar-23.1.x
ubuntu/precise
ubuntu/trusty
ubuntu/xenial
ubuntu/yakkety
ubuntu/zesty
upstream/20.4.1
v22.3
github.com: canonical/cloud-init.git
summary
refs
log
tree
commit
diff
log msg
author
committer
range
path:
root
/
cloudinit
/
mergers
/
__init__.py
Commit message (
Expand
)
Author
Age
Files
Lines
*
Refactor: Drop inheritance from object (#1728)
Alberto Contreras
2022-09-14
1
-1
/
+1
*
Adopt Black and isort (SC-700) (#1157)
James Falcon
2021-12-15
1
-20
/
+23
*
cloudinit: remove unused LOG variables (#574)
Daniel Watkins
2020-09-16
1
-2
/
+0
*
Start removing dependency on six (#178)
Daniel Watkins
2020-01-21
1
-3
/
+1
*
LICENSE: Allow dual licensing GPL-3 or Apache 2.0
Jon Grimm
2016-12-22
1
-15
/
+5
*
Largely merge lp:~harlowja/cloud-init/py2-3 albeit manually because it seemed
Barry Warsaw
2015-01-21
1
-1
/
+3
*
Remove/adjust the verbose 'failed at attempted import of' log
Joshua Harlow
2014-09-02
1
-4
/
+6
*
Remove some of the more useless debug logs
Joshua Harlow
2014-07-15
1
-5
/
+0
*
More merging adjustments.
Joshua Harlow
2013-05-03
1
-1
/
+1
*
Continue working on merging.
Joshua Harlow
2013-04-22
1
-2
/
+10
*
Remove str merging for now.
Joshua Harlow
2013-04-18
1
-1
/
+1
*
Handle namespacing issues.
Joshua Harlow
2013-04-17
1
-3
/
+8
*
more pep8/pylint. all clean now
Scott Moser
2013-03-07
1
-2
/
+0
*
fix pep8 and pylint
Scott Moser
2013-03-07
1
-2
/
+3
*
change default merge type
Scott Moser
2013-03-07
1
-1
/
+1
*
Add some nice docs on what this is.
Joshua Harlow
2013-03-06
1
-1
/
+1
*
Continue working on merging code.
Joshua Harlow
2013-03-06
1
-3
/
+10
*
Add in a bunch of changes and tests.
Joshua Harlow
2013-03-05
1
-11
/
+48
*
Allow mergers to take options.
Joshua Harlow
2012-11-22
1
-15
/
+22
*
Start allowing different merging types to be applied
Joshua Harlow
2012-11-20
1
-0
/
+104