From: Ben Pfaff Date: Mon, 15 Jun 2009 23:08:34 +0000 (-0700) Subject: Update license on file not in citrix branch to Apache 2.0. X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=510b55a2b6be6191664076e6894fefd8f81675e3;p=openvswitch Update license on file not in citrix branch to Apache 2.0. On the citrix branch we changed the license to Apache 2.0. Merging the citrix branch into master hence updated the license of all the files that existed in the citrix branch. However one file was added in master that wasn't in citrix, so this commit updates the license on that new file. --- diff --git a/tests/test-vconn.c b/tests/test-vconn.c index cefe899b..7f85137a 100644 --- a/tests/test-vconn.c +++ b/tests/test-vconn.c @@ -1,17 +1,17 @@ /* * Copyright (c) 2009 Nicira Networks. * - * Permission to use, copy, modify, and/or distribute this software for any - * purpose with or without fee is hereby granted, provided that the above - * copyright notice and this permission notice appear in all copies. + * 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: * - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES - * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF - * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR - * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES - * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN - * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF - * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + * 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. */ #include