Updating license and copyright

ahkumar · May 31, 2017 · 6a6fb25 · 6a6fb25
1 parent e6ea055
commit 6a6fb25
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 15 deletions.
diff --git a/COPYRIGHT.md b/COPYRIGHT.md
@@ -1,3 +1,5 @@
+Copyright (c) 2017, SingularityWare, LLC. All rights reserved.
+
 Copyright (c) 2015-2017, Gregory M. Kurtzer. All rights reserved.
 
 Copyright (c) 2016-2017, The Regents of the University of California,

diff --git a/LICENSE-LBNL.md b/LICENSE-LBNL.md
@@ -1,3 +1,8 @@
+Copyright (c) 2016-2017, The Regents of the University of California,
+through Lawrence Berkeley National Laboratory (subject to receipt of any
+required approvals from the U.S. Dept. of Energy).  All rights reserved.
+
+
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions
 are met:
@@ -23,14 +28,3 @@ PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
 OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-You are under no obligation whatsoever to provide any bug fixes, patches,
-or upgrades to the features, functionality or performance of the source
-code ("Enhancements") to anyone; however, if you choose to make your
-Enhancements available either publicly, or directly to Lawrence Berkeley
-National Laboratory, without imposing a separate written license
-agreement for such Enhancements, then you hereby grant the following
-license: a non-exclusive, royalty-free perpetual license to install, use,
-modify, prepare derivative works, incorporate into other computer software,
-distribute, and sublicense such enhancements or derivative works thereof,
-in binary and source code form.
diff --git a/LICENSE.md b/LICENSE.md
@@ -3,13 +3,14 @@ modification, are permitted provided that the following conditions are met:
 
 1. Redistributions of source code must retain the above copyright notice,
    this list of conditions and the following disclaimer.
+
 2. Redistributions in binary form must reproduce the above copyright notice,
    this list of conditions and the following disclaimer in the documentation
    and/or other materials provided with the distribution.
-3. Neither the name of the University of California, Lawrence Berkeley
-   National Laboratory, U.S. Dept. of Energy nor the names of its
-   contributors may be used to endorse or promote products derived from
-   this software without specific prior written permission.
+
+3. Neither the name of the copyright holder nor the names of its
+   contributors may be used to endorse or promote products derived from this
+   software without specific prior written permission.
 
 THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
 AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE