diff options
author | Jenkins <jenkins@review.openstack.org> | 2014-06-10 10:14:34 +0000 |
---|---|---|
committer | Gerrit Code Review <review@openstack.org> | 2014-06-10 10:14:34 +0000 |
commit | 2ce64d4c9715c4d5a1c63f8deafc895d287dff65 (patch) | |
tree | 1cc8f05656e1bcb5228169c29def9a539304dfd5 /ceilometer/publisher | |
parent | 3d2723ed7d09724e743869d9ba7b9b37692ed340 (diff) | |
parent | d7054053ae1f0dad276279bdf66c622842fec1be (diff) | |
download | ceilometer-2ce64d4c9715c4d5a1c63f8deafc895d287dff65.tar.gz |
Merge "Remove (c) and remove unnecessary encoding lines"
Diffstat (limited to 'ceilometer/publisher')
-rw-r--r-- | ceilometer/publisher/__init__.py | 5 | ||||
-rw-r--r-- | ceilometer/publisher/file.py | 1 | ||||
-rw-r--r-- | ceilometer/publisher/rpc.py | 3 | ||||
-rw-r--r-- | ceilometer/publisher/test.py | 3 | ||||
-rw-r--r-- | ceilometer/publisher/udp.py | 3 | ||||
-rw-r--r-- | ceilometer/publisher/utils.py | 3 |
6 files changed, 6 insertions, 12 deletions
diff --git a/ceilometer/publisher/__init__.py b/ceilometer/publisher/__init__.py index 94124747..a0a7f851 100644 --- a/ceilometer/publisher/__init__.py +++ b/ceilometer/publisher/__init__.py @@ -1,7 +1,6 @@ -# -*- encoding: utf-8 -*- # -# Copyright © 2013 Intel Corp. -# Copyright © 2013 eNovance +# Copyright 2013 Intel Corp. +# Copyright 2013 eNovance # # Author: Yunhong Jiang <yunhong.jiang@intel.com> # Julien Danjou <julien@danjou.info> diff --git a/ceilometer/publisher/file.py b/ceilometer/publisher/file.py index 70f66281..d0edcfa1 100644 --- a/ceilometer/publisher/file.py +++ b/ceilometer/publisher/file.py @@ -1,4 +1,3 @@ -# -*- encoding: utf-8 -*- # # Copyright 2013 IBM Corp # diff --git a/ceilometer/publisher/rpc.py b/ceilometer/publisher/rpc.py index 922098af..51758097 100644 --- a/ceilometer/publisher/rpc.py +++ b/ceilometer/publisher/rpc.py @@ -1,6 +1,5 @@ -# -*- encoding: utf-8 -*- # -# Copyright © 2012 New Dream Network, LLC (DreamHost) +# Copyright 2012 New Dream Network, LLC (DreamHost) # # Author: Doug Hellmann <doug.hellmann@dreamhost.com> # diff --git a/ceilometer/publisher/test.py b/ceilometer/publisher/test.py index 37fbeb47..8164ec28 100644 --- a/ceilometer/publisher/test.py +++ b/ceilometer/publisher/test.py @@ -1,6 +1,5 @@ -# -*- encoding: utf-8 -*- # -# Copyright © 2013 eNovance +# Copyright 2013 eNovance # # Author: Julien Danjou <julien@danjou.info> # diff --git a/ceilometer/publisher/udp.py b/ceilometer/publisher/udp.py index 39a9a9ba..6baac074 100644 --- a/ceilometer/publisher/udp.py +++ b/ceilometer/publisher/udp.py @@ -1,6 +1,5 @@ -# -*- encoding: utf-8 -*- # -# Copyright © 2013 eNovance +# Copyright 2013 eNovance # # Author: Julien Danjou <julien@danjou.info>, # Tyaptin Ilya <ityaptin@mirantis.com> diff --git a/ceilometer/publisher/utils.py b/ceilometer/publisher/utils.py index 2d5409a6..85a9b62c 100644 --- a/ceilometer/publisher/utils.py +++ b/ceilometer/publisher/utils.py @@ -1,6 +1,5 @@ -# -*- encoding: utf-8 -*- # -# Copyright © 2012 New Dream Network, LLC (DreamHost) +# Copyright 2012 New Dream Network, LLC (DreamHost) # # Author: Doug Hellmann <doug.hellmann@dreamhost.com> # Tyaptin Ilya <ityaptin@mirantis.com> |