diff options
| author | Scott Moser <smoser@brickies.net> | 2017-01-20 10:06:55 -0500 |
|---|---|---|
| committer | Scott Moser <smoser@brickies.net> | 2017-01-20 10:06:55 -0500 |
| commit | d00b7dba8767618ae360f56bf64b7ab7a8c49d2e (patch) | |
| tree | 349799f76c39669a03a6acbd48502970c0abb994 /tests/unittests/test_merging.py | |
| parent | fa3009b64949fef3744ddb940f01477dfa2d25e5 (diff) | |
| parent | 7fb6f78177b5ece10ca7c54ba3958010a9987f06 (diff) | |
| download | vyos-cloud-init-d00b7dba8767618ae360f56bf64b7ab7a8c49d2e.tar.gz vyos-cloud-init-d00b7dba8767618ae360f56bf64b7ab7a8c49d2e.zip | |
merge from 0.7.9 at 0.7.9
Diffstat (limited to 'tests/unittests/test_merging.py')
| -rw-r--r-- | tests/unittests/test_merging.py | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/tests/unittests/test_merging.py b/tests/unittests/test_merging.py index a33ec184..0658b6b4 100644 --- a/tests/unittests/test_merging.py +++ b/tests/unittests/test_merging.py @@ -1,3 +1,5 @@ +# This file is part of cloud-init. See LICENSE file for license information. + from . import helpers from cloudinit.handlers import cloud_config @@ -255,3 +257,5 @@ class TestSimpleRun(helpers.ResourceUsingTestCase): c = _old_mergedict(a, b) d = util.mergemanydict([a, b]) self.assertEqual(c, d) + +# vi: ts=4 expandtab |