diff options
| author | Christian Ehrhardt <christian.ehrhardt@canonical.com> | 2016-06-07 18:04:27 +0200 |
|---|---|---|
| committer | Christian Ehrhardt <christian.ehrhardt@canonical.com> | 2016-06-07 18:04:27 +0200 |
| commit | 3a51f0df3270a70a130b0dea7d3410b4742dcb2a (patch) | |
| tree | d41f0efb8289d3cf17586e05c9fec72990c647c1 /cloudinit/settings.py | |
| parent | f4df4fbf200ef04c841bc36baa559bce265fcb38 (diff) | |
| parent | 2268993b5cb770babb995efd5bb799517528b8a4 (diff) | |
| download | vyos-cloud-init-3a51f0df3270a70a130b0dea7d3410b4742dcb2a.tar.gz vyos-cloud-init-3a51f0df3270a70a130b0dea7d3410b4742dcb2a.zip | |
merge with upstream to avoid merge conflicts on the merge proposal
Diffstat (limited to 'cloudinit/settings.py')
0 files changed, 0 insertions, 0 deletions