diff options
author | Avneesh Sachdev <avneesh@sproute.com> | 2016-07-14 18:59:30 +0200 |
---|---|---|
committer | Donald Sharp <sharpd@cumulusnetworks.com> | 2016-09-23 18:12:16 +0200 |
commit | 4087409cdba71b5f95662e202cc33cf92ed055cd (patch) | |
tree | 697f6ffaaa1986dbc863b59b79e5cb0347bd565f /qpb/qpb.proto | |
parent | fpm: Add protobuf support for FPM. (diff) | |
download | frr-4087409cdba71b5f95662e202cc33cf92ed055cd.tar.xz frr-4087409cdba71b5f95662e202cc33cf92ed055cd.zip |
Use only the ISC license for .proto files.
Simplify licensing for protobuf files based on discussion on the
quagga-dev mailing list.
Previously, users could choose between the GPL and the ISC license.
Signed-off-by: Avneesh Sachdev <avneesh@sproute.com>
Signed-off-by: Avneesh Sachdev <avneesh@sproute.com>
Diffstat (limited to 'qpb/qpb.proto')
-rw-r--r-- | qpb/qpb.proto | 31 |
1 files changed, 0 insertions, 31 deletions
diff --git a/qpb/qpb.proto b/qpb/qpb.proto index 7ee409df8..8323d3ed7 100644 --- a/qpb/qpb.proto +++ b/qpb/qpb.proto @@ -5,37 +5,6 @@ * * @author Avneesh Sachdev <avneesh@sproute.com> * - * Permission is granted to use, copy, modify and/or distribute this - * software under either one of the licenses below. - * - * Note that if you use other files from the Quagga tree directly or - * indirectly, then the licenses in those files still apply. - * - * Please retain both licenses below when modifying this code in the - * Quagga tree. - */ - -/* - * License Option 1: GPL - * - * 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 2 of the License, or (at your option) - * any later version. - * - * 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, write to the Free Software Foundation, Inc., - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - */ - -/* - * License Option 2: ISC License - * * 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 |