From: Keith Busch <[mailto:keith.busch@intel.com]>
Date: Fri, 1 May 2015 22:32:57 +0000 (-0600)
Subject: Switch license from GPLv2 to Apache
X-Git-Tag: v0.1~47
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=457764bee4b540af109cf4bd470c697d8a26e1da;p=users%2Fsagi%2Fnvme-cli.git

Switch license from GPLv2 to Apache

Signed-off-by: Keith Busch <keith.busch@intel.com>
Signed-off-by: Stephen Bates <sbates@raithlin.com>
---

diff --git a/LICENSE b/LICENSE
index 9aa03b39..303584d4 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,12 +1,11 @@
-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 <http://www.gnu.org/licenses/>.
+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.
diff --git a/nvme.c b/nvme.c
index a0ded2a6..f2e4ac36 100644
--- a/nvme.c
+++ b/nvme.c
@@ -1,23 +1,24 @@
 /*
  * nvme.c -- NVM-Express command line utility.
  *
- * Copyright (c) 2014, Intel Corporation.
+ * Copyright (c) 2014-2015, Intel Corporation.
  *
  * Written by Keith Busch <keith.busch@intel.com>
  *
- * 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.
+ * 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.gnu.org/licenses/>.
+ *    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.
+ */
+
+/**
  * This program uses NVMe IOCTLs to run native nvme commands to a device.
  */