From: Stephen Bates <sbates@raithlin.com>
Date: Tue, 2 Jun 2015 15:27:54 +0000 (-0600)
Subject: Reverted to GPL licensing
X-Git-Tag: v0.1~41
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=3fdbf125a2448a52a64d40dd46923ce223871aa9;p=users%2Fsagi%2Fnvme-cli.git

Reverted to GPL licensing

Mixed licensing is not distributable. Based on this and on discussions
between Stephen, Keith and various legal people we are aligning with
GPL.
---

diff --git a/LICENSES/GPL_LICENSE b/LICENSE
similarity index 100%
rename from LICENSES/GPL_LICENSE
rename to LICENSE
diff --git a/LICENSES/APACHE_LICENSE b/LICENSES/APACHE_LICENSE
deleted file mode 100644
index 303584d4..00000000
--- a/LICENSES/APACHE_LICENSE
+++ /dev/null
@@ -1,11 +0,0 @@
-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
-
-    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.