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 /cloudinit/reporting | |
| 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 'cloudinit/reporting')
| -rw-r--r-- | cloudinit/reporting/__init__.py | 5 | ||||
| -rw-r--r-- | cloudinit/reporting/events.py | 7 | ||||
| -rw-r--r-- | cloudinit/reporting/handlers.py | 4 |
3 files changed, 10 insertions, 6 deletions
diff --git a/cloudinit/reporting/__init__.py b/cloudinit/reporting/__init__.py index 6b41ae61..1ed2b487 100644 --- a/cloudinit/reporting/__init__.py +++ b/cloudinit/reporting/__init__.py @@ -1,6 +1,7 @@ -# Copyright 2015 Canonical Ltd. -# This file is part of cloud-init. See LICENCE file for license information. +# Copyright (C) 2015 Canonical Ltd. # +# This file is part of cloud-init. See LICENSE file for license information. + """ cloud-init reporting framework diff --git a/cloudinit/reporting/events.py b/cloudinit/reporting/events.py index df2b9b4a..4f62d2f9 100644 --- a/cloudinit/reporting/events.py +++ b/cloudinit/reporting/events.py @@ -1,6 +1,7 @@ -# Copyright 2015 Canonical Ltd. -# This file is part of cloud-init. See LICENCE file for license information. +# Copyright (C) 2015 Canonical Ltd. # +# This file is part of cloud-init. See LICENSE file for license information. + """ events for reporting. @@ -245,4 +246,4 @@ def _collect_file_info(files): 'encoding': 'base64'}) return ret -# vi: ts=4 expandtab syntax=python +# vi: ts=4 expandtab diff --git a/cloudinit/reporting/handlers.py b/cloudinit/reporting/handlers.py index dff20ecb..b90bc191 100644 --- a/cloudinit/reporting/handlers.py +++ b/cloudinit/reporting/handlers.py @@ -1,4 +1,4 @@ -# vi: ts=4 expandtab +# This file is part of cloud-init. See LICENSE file for license information. import abc import json @@ -89,3 +89,5 @@ available_handlers = DictRegistry() available_handlers.register_item('log', LogHandler) available_handlers.register_item('print', PrintHandler) available_handlers.register_item('webhook', WebHookHandler) + +# vi: ts=4 expandtab |