diff options
| author | Kim Hagen <kim.sidney@gmail.com> | 2018-10-25 22:26:25 +0200 |
|---|---|---|
| committer | Kim Hagen <kim.sidney@gmail.com> | 2018-10-25 22:26:25 +0200 |
| commit | b120f4f7a670674779a93f8c882c81f44a993888 (patch) | |
| tree | 906d15f6520751b5e8fbeb49b680e673a5cc6aa3 /Makefile | |
| parent | 838581d57c8765d3e487f58bc37ea103af39d26f (diff) | |
| parent | 833adcdf6f85ec2305e62bea5a20f9363bf95507 (diff) | |
| download | vyos-cloud-init-b120f4f7a670674779a93f8c882c81f44a993888.tar.gz vyos-cloud-init-b120f4f7a670674779a93f8c882c81f44a993888.zip | |
Merge tag 'ubuntu/18.4-0ubuntu1_16.04.2' into current
Conflicts:
cloudinit/sources/DataSourceAzure.py
config/cloud.cfg.tmpl
integration-requirements.txt
tools/read-version
Diffstat (limited to 'Makefile')
0 files changed, 0 insertions, 0 deletions