From f68b699e2994d6d0d8c5d021cea2718a19825945 Mon Sep 17 00:00:00 2001 From: QiLiang Date: Tue, 15 Mar 2016 12:05:02 +0800 Subject: Change copyright for dispatchers. Changed to ceilometer/influxdb-python copyright as lots of concepts and code have been reused. JIRA: - Change-Id: I5fb0a8f9dac2e7b816240f5cf4d43f31f8e1a2f3 Signed-off-by: QiLiang (cherry picked from commit 9369e4f06e308735868af960e13e737091bb0bea) --- yardstick/dispatcher/base.py | 23 ++++++++++++++++------- yardstick/dispatcher/file.py | 23 ++++++++++++++++------- yardstick/dispatcher/http.py | 23 ++++++++++++++++------- yardstick/dispatcher/influxdb_line_protocol.py | 23 +++++++++++++++++++++++ 4 files changed, 71 insertions(+), 21 deletions(-) diff --git a/yardstick/dispatcher/base.py b/yardstick/dispatcher/base.py index fe635b9d4..ffdddb0ff 100644 --- a/yardstick/dispatcher/base.py +++ b/yardstick/dispatcher/base.py @@ -1,11 +1,20 @@ -############################################################################## -# Copyright (c) 2015 Huawei Technologies Co.,Ltd and others. +# Copyright 2013 IBM Corp +# All Rights Reserved. # -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Apache License, Version 2.0 -# which accompanies this distribution, and is available at -# http://www.apache.org/licenses/LICENSE-2.0 -############################################################################## +# Licensed under the Apache License, Version 2.0 (the "License"); you may +# not use this file except in compliance with the License. You may obtain +# a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT +# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the +# License for the specific language governing permissions and limitations +# under the License. + +# yardstick comment: this is a modified copy of +# ceilometer/ceilometer/dispatcher/__init__.py import abc import six diff --git a/yardstick/dispatcher/file.py b/yardstick/dispatcher/file.py index 50414b969..ab67796e9 100644 --- a/yardstick/dispatcher/file.py +++ b/yardstick/dispatcher/file.py @@ -1,11 +1,20 @@ -############################################################################## -# Copyright (c) 2015 Huawei Technologies Co.,Ltd and others. +# Copyright 2013 IBM Corp +# All Rights Reserved. # -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Apache License, Version 2.0 -# which accompanies this distribution, and is available at -# http://www.apache.org/licenses/LICENSE-2.0 -############################################################################## +# Licensed under the Apache License, Version 2.0 (the "License"); you may +# not use this file except in compliance with the License. You may obtain +# a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT +# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the +# License for the specific language governing permissions and limitations +# under the License. + +# yardstick comment: this is a modified copy of +# ceilometer/ceilometer/dispatcher/file.py import logging import json diff --git a/yardstick/dispatcher/http.py b/yardstick/dispatcher/http.py index f84ad0970..2298d00cc 100644 --- a/yardstick/dispatcher/http.py +++ b/yardstick/dispatcher/http.py @@ -1,11 +1,20 @@ -############################################################################## -# Copyright (c) 2015 Huawei Technologies Co.,Ltd and others. +# Copyright 2013 IBM Corp +# All Rights Reserved. # -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Apache License, Version 2.0 -# which accompanies this distribution, and is available at -# http://www.apache.org/licenses/LICENSE-2.0 -############################################################################## +# Licensed under the Apache License, Version 2.0 (the "License"); you may +# not use this file except in compliance with the License. You may obtain +# a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT +# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the +# License for the specific language governing permissions and limitations +# under the License. + +# yardstick comment: this is a modified copy of +# ceilometer/ceilometer/dispatcher/http.py import os import json diff --git a/yardstick/dispatcher/influxdb_line_protocol.py b/yardstick/dispatcher/influxdb_line_protocol.py index 3e830ed5e..eee982163 100644 --- a/yardstick/dispatcher/influxdb_line_protocol.py +++ b/yardstick/dispatcher/influxdb_line_protocol.py @@ -1,3 +1,26 @@ +# The MIT License (MIT) + +# Copyright (c) 2013 InfluxDB + +# Permission is hereby granted, free of charge, to any person obtaining a copy +# of this software and associated documentation files (the "Software"), to deal +# in +# the Software without restriction, including without limitation the rights to +# use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies +# of the Software, and to permit persons to whom the Software is furnished to +# do so, subject to the following conditions: + +# The above copyright notice and this permission notice shall be included in +# all copies or substantial portions of the Software. + +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +# SOFTWARE. + # yardstick comment: this file is a modified copy of # influxdb-python/influxdb/line_protocol.py -- cgit 1.2.3-korg