From 41df555bba7db235812c445e772364a692ba6d35 Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Mon, 9 May 2016 13:44:51 +0200 Subject: [PATCH] Relicense to Apache-2.0 Apache-2.0 is the recommended license for OpenStack Big Tent projects (see https://governance.openstack.org/reference/licensing.html) and this simplifies the licensing of the overall git repo quite a bit by removing an exception clause. Change-Id: I827eb91fd18ced1848439d573cfe6df16ed27748 Closes-Bug: #1564844 (cherry picked from commit 3d724a29a93618bfdbe293a2323a90d8d66b4da0) --- ocf/NovaCompute | 27 ++++++--------------------- ocf/NovaEvacuate | 26 ++++++-------------------- 2 files changed, 12 insertions(+), 41 deletions(-) diff --git a/ocf/NovaCompute b/ocf/NovaCompute index 3946c9b..f183cae 100644 --- a/ocf/NovaCompute +++ b/ocf/NovaCompute @@ -1,30 +1,15 @@ #!/bin/sh +# Copyright 2015 Red Hat, Inc. # +# Description: Manages compute daemons # -# NovaCompute agent manages compute daemons. +# Authors: Andrew Beekhof # -# Copyright (c) 2015 -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of version 2 of the GNU General Public License as -# published by the Free Software Foundation. -# -# This program is distributed in the hope that it would be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -# -# Further, this software is distributed without any warranty that it is -# free of the rightful claim of any third person regarding infringement -# or the like. Any license provided herein, whether implied or -# otherwise, applies only to this software file. Patent licenses, if -# any, provided herein do not apply to combinations of this program with -# other software, or any other product whatsoever. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write the Free Software Foundation, -# Inc., 59 Temple Place - Suite 330, Boston MA 02111-1307, USA. +# Support: openstack@lists.openstack.org +# License: Apache Software License (ASL) 2.0 # + ####################################################################### # Initialization: diff --git a/ocf/NovaEvacuate b/ocf/NovaEvacuate index 0fcd041..90b059d 100644 --- a/ocf/NovaEvacuate +++ b/ocf/NovaEvacuate @@ -1,30 +1,16 @@ #!/bin/bash # +# Copyright 2015 Red Hat, Inc. # -# NovaEvacuate agent manages evacuation of nodes running nova-compute. +# Description: Manages evacuation of nodes running nova-compute # -# Copyright (c) 2015 +# Authors: Andrew Beekhof # -# This program is free software; you can redistribute it and/or modify -# it under the terms of version 2 of the GNU General Public License as -# published by the Free Software Foundation. -# -# This program is distributed in the hope that it would be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -# -# Further, this software is distributed without any warranty that it is -# free of the rightful claim of any third person regarding infringement -# or the like. Any license provided herein, whether implied or -# otherwise, applies only to this software file. Patent licenses, if -# any, provided herein do not apply to combinations of this program with -# other software, or any other product whatsoever. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write the Free Software Foundation, -# Inc., 59 Temple Place - Suite 330, Boston MA 02111-1307, USA. +# Support: openstack@lists.openstack.org +# License: Apache Software License (ASL) 2.0 # + ####################################################################### # Initialization: