summaryrefslogtreecommitdiff
path: root/cloudinit/reporting
diff options
context:
space:
mode:
authorJon Grimm <jon.grimm@canonical.com>2016-11-22 17:09:53 -0600
committerScott Moser <smoser@brickies.net>2016-12-22 17:04:28 -0500
commitb2a9f33616c806ae6e052520a8589113308f567c (patch)
treee24d64e56104dfa1b608a9f255c9b8f618e45cc0 /cloudinit/reporting
parent0b0f254a6935a1b1fff128fa177152dd519e1a3d (diff)
downloadvyos-cloud-init-b2a9f33616c806ae6e052520a8589113308f567c.tar.gz
vyos-cloud-init-b2a9f33616c806ae6e052520a8589113308f567c.zip
LICENSE: Allow dual licensing GPL-3 or Apache 2.0
This has been a recurring ask and we had initially just made the change to the cloud-init 2.0 codebase. As the current thinking is we'll just continue to enhance the current codebase, its desirable to relicense to match what we'd intended as part of the 2.0 plan here. - put a brief description of license in LICENSE file - put full license versions in LICENSE-GPLv3 and LICENSE-Apache2.0 - simplify the per-file header to reference LICENSE - tox: ignore H102 (Apache License Header check) Add license header to files that ship. Reformat headers, make sure everything has vi: at end of file. Non-shipping files do not need the copyright header, but at the moment tests/ have it.
Diffstat (limited to 'cloudinit/reporting')
-rw-r--r--cloudinit/reporting/__init__.py5
-rw-r--r--cloudinit/reporting/events.py7
-rw-r--r--cloudinit/reporting/handlers.py4
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