summaryrefslogtreecommitdiff
path: root/cloudinit/mergers
Commit message (Collapse)AuthorAgeFilesLines
* Refactor: Drop inheritance from object (#1728)Alberto Contreras2022-09-144-4/+4
| | | As we do not support python2 anymore, we can remove those 8 chars.
* Adopt Black and isort (SC-700) (#1157)James Falcon2021-12-154-49/+70
| | | | | Applied Black and isort, fixed any linting issues, updated tox.ini and CI.
* cloudinit: remove unused LOG variables (#574)Daniel Watkins2020-09-161-2/+0
| | | Co-authored-by: Rick Harding <rharding@mitechie.com>
* Start removing dependency on six (#178)Daniel Watkins2020-01-214-16/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * url_helper: drop six * url_helper: sort imports * log: drop six * log: sort imports * handlers/__init__: drop six * handlers/__init__: sort imports * user_data: drop six * user_data: sort imports * sources/__init__: drop six * sources/__init__: sort imports * DataSourceOVF: drop six * DataSourceOVF: sort imports * sources/helpers/openstack: drop six * sources/helpers/openstack: sort imports * mergers/m_str: drop six This also allowed simplification of the logic, as we will never encounter a non-string text type. * type_utils: drop six * mergers/m_dict: drop six * mergers/m_list: drop six * cmd/query: drop six * mergers/__init__: drop six * net/cmdline: drop six * reporting/handlers: drop six * reporting/handlers: sort imports
* LICENSE: Allow dual licensing GPL-3 or Apache 2.0Jon Grimm2016-12-224-59/+18
| | | | | | | | | | | | | | | | | | This has been a recurring ask and we had initially just made the change to the cloud-init 2.0 codebase. As the current thinking is we'll just continue to enhance the current codebase, its desirable to relicense to match what we'd intended as part of the 2.0 plan here. - put a brief description of license in LICENSE file - put full license versions in LICENSE-GPLv3 and LICENSE-Apache2.0 - simplify the per-file header to reference LICENSE - tox: ignore H102 (Apache License Header check) Add license header to files that ship. Reformat headers, make sure everything has vi: at end of file. Non-shipping files do not need the copyright header, but at the moment tests/ have it.
* Largely merge lp:~harlowja/cloud-init/py2-3 albeit manually because it seemedBarry Warsaw2015-01-214-8/+16
| | | | | | to be behind trunk. `tox -e py27` passes full test suite. Now to work on replacing mocker.
* Remove/adjust the verbose 'failed at attempted import of' logJoshua Harlow2014-09-021-4/+6
| | | | | | | Instead of using this log (which really isn't a failure) we should instead of just return the looked up locations and then if there really is an error the caller can handle the usage of the looked up locations as they choose fit.
* fix(pep8): Fix various pep8 violations and version-lock pep8Jay Faulkner2014-08-261-1/+1
| | | | | | Fixed all complaints from running "make pep8". Also version locked pep8 in test-requirements.txt to ensure that pep8 requirements don't change without an explicit commit.
* Remove some of the more useless debug logsJoshua Harlow2014-07-151-5/+0
|
* fix pep8 errors.Juerg Haefliger2013-06-191-0/+1
|
* Allow lists to have no_replace option.Joshua Harlow2013-05-091-3/+5
|
* A few more test files.Joshua Harlow2013-05-071-3/+9
|
* A few pep8/pylint cleanups.Joshua Harlow2013-05-032-6/+3
|
* A few more tests + cleanings.Joshua Harlow2013-05-031-2/+5
|
* More merging adjustments.Joshua Harlow2013-05-034-13/+69
| | | | | Looks like this should be in pretty good shape and has passed some of the basic backwards compat. merging tests that I added.
* Continue working on merging.Joshua Harlow2013-04-223-35/+109
|
* Remove str merging for now.Joshua Harlow2013-04-182-40/+1
|
* Pull from head and a couple more tweaks.Joshua Harlow2013-04-184-9/+13
|\
| * Handle namespacing issues.Joshua Harlow2013-04-174-3/+8
| | | | | | | | | | | | | | Move from using the inbuilt type names as module names which is a bad thing to use it appears due to naming conflicts in the __init__ module and reduce the chances of these conflicts by enforcing a m_ prefix for merging modules.
* | Adjust how merging is done.Joshua Harlow2013-04-182-17/+6
|/
* more pep8/pylint. all clean nowScott Moser2013-03-071-2/+0
|
* fix pep8 and pylintScott Moser2013-03-072-3/+4
|
* change default merge typeScott Moser2013-03-071-1/+1
| | | | | | the default merge type here was appending to strings and extending lists. Instead we want the same default that cloud-init had previously, which was to overwrite lists and strings.
* Add some nice docs on what this is.Joshua Harlow2013-03-061-1/+1
|
* Continue working on merging code.Joshua Harlow2013-03-061-3/+10
|
* Add in a bunch of changes and tests.Joshua Harlow2013-03-054-20/+76
|
* More cleanups.Joshua Harlow2012-11-222-10/+4
|
* Allow mergers to take options.Joshua Harlow2012-11-224-30/+59
|
* Start allowing different merging types to be appliedJoshua Harlow2012-11-204-0/+206
After user data handling splits apart all the different content types into there various mime messages it is nice to be able to have each message specify how it should be merged (mainly for cloud-config or cloud-archive) into the single cloud config that is eventually used. This starts to add a plugable merging framework and the needed components to activate said headers and merging.
View Lorry Controller Status