From 886485c4684b5fc88491f578198a2423392dd066 Mon Sep 17 00:00:00 2001 From: Julien Danjou Date: Thu, 10 May 2012 15:53:20 +0200 Subject: [PATCH] Change license to Apache 2.0 Change-Id: I062d722fb570a6f00151eb620d8c169b2ee374ae Signed-off-by: Julien Danjou --- bin/ceilometer-nova-compute | 21 +++++++++------------ ceilometer/rpc/__init__.py | 20 +++++++++----------- setup.py | 20 +++++++++----------- 3 files changed, 27 insertions(+), 34 deletions(-) diff --git a/bin/ceilometer-nova-compute b/bin/ceilometer-nova-compute index 328524c9..615139a1 100755 --- a/bin/ceilometer-nova-compute +++ b/bin/ceilometer-nova-compute @@ -5,20 +5,17 @@ # # Author: Julien Danjou # -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. +# 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 # -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. +# http://www.apache.org/licenses/LICENSE-2.0 # -# You should have received a copy of the GNU General Public License -# along with this program. If not, see . -# - +# 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. def consumer(msg): # XXX This should resend message to some bus for data collection diff --git a/ceilometer/rpc/__init__.py b/ceilometer/rpc/__init__.py index cd9e841e..39e2fa96 100644 --- a/ceilometer/rpc/__init__.py +++ b/ceilometer/rpc/__init__.py @@ -4,19 +4,17 @@ # # Author: Julien Danjou # -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. +# 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 # -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see . +# 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. from nova.rpc import impl_kombu diff --git a/setup.py b/setup.py index 7447203d..26363c98 100755 --- a/setup.py +++ b/setup.py @@ -5,19 +5,17 @@ # # Author: Julien Danjou # -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. +# 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 # -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see . +# 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. import setuptools