diff options
| author | Christian Ehrhardt <christian.ehrhardt@canonical.com> | 2016-05-30 13:10:13 +0200 |
|---|---|---|
| committer | Christian Ehrhardt <christian.ehrhardt@canonical.com> | 2016-05-30 13:10:13 +0200 |
| commit | aefffff0e3df98a435133b598217401c3f953cc6 (patch) | |
| tree | 9a141352c311aa541f93de560fcfec9c0d213476 /tests/data/user_data.1.txt | |
| parent | 3c85315373306729443ef79fd8e54af46a7bc849 (diff) | |
| parent | 0dbe69aa34948d73d5709a7ddc19389e05e1a268 (diff) | |
| download | vyos-cloud-init-aefffff0e3df98a435133b598217401c3f953cc6.tar.gz vyos-cloud-init-aefffff0e3df98a435133b598217401c3f953cc6.zip | |
merge with last upstream to avoid merging conflicts on MP
Diffstat (limited to 'tests/data/user_data.1.txt')
0 files changed, 0 insertions, 0 deletions