index
:
delta/cloud-init.git
baserock/0.7.4
baserock/morph
baserock/morph-rebase-7-3v2
baserock/pedroalvarez/add-more-openstack-clients
tmp
trunk
launchpad.net: Obsolete (use 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
*
README: Mention move of revision control to git.
HEAD
trunk
Scott Moser
2016-08-10
1
-166
/
+0
*
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
