From: Brian Behlendorf <behlendorf1@llnl.gov>
Date: Tue, 18 May 2010 21:41:47 +0000 (-0700)
Subject: Revert accidental change to COPYING, move authors to master branch.
X-Git-Tag: zfs-0.4.9~7^2^2^2^2~5
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ebac5578835a6bb6bac81fd3a6bd4a3022b2486d;p=zfs

Revert accidental change to COPYING, move authors to master branch.
---

diff --git a/AUTHORS b/AUTHORS
deleted file mode 100644
index 04ebc204f..000000000
--- a/AUTHORS
+++ /dev/null
@@ -1,4 +0,0 @@
-Brian Behlendorf <behlendorf1@llnl.gov>,
-Herb Wartens <wartens2@llnl.gov>,
-Jim Garlick <garlick@llnl.gov>,
-Ricardo M. Correia <Ricardo.M.Correia@sun.com>
diff --git a/COPYING b/COPYING
index 50dcc09e3..90f44901b 100644
--- a/COPYING
+++ b/COPYING
@@ -1,2 +1,2 @@
-The library is distributed under the terms of the CDDL.
-See the file OPENSOLARIS.LICENSE for more information.
+Please see COPYRIGHT and OPENSOLARIS.LICENSE for the copyright
+and license details.