Auto-merge bulk update of org policies

* Bulk update of repo policies * Bulk update of repo policies * Bulk update of repo policies * Bulk update of repo policies * Bulk update of repo policies * Bulk update of repo policies * Bulk update of repo policies * Bulk update of repo policies * Bulk update of repo policies * Bulk update of repo policies * Bulk update of repo policies * Bulk update of repo policies * Bulk update of repo policies * Bulk update of repo policies * Bulk update of repo policies * Bulk update of repo policies * Bulk update of repo policies
e-mission · Jan 14, 2021 · 4f32000 · 4f32000
1 parent 693ca0e
commit 4f32000
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 9 deletions.
diff --git a/LICENSE b/LICENSE
@@ -1,21 +1,21 @@
 BSD 3-Clause License
 
-Copyright (c) 2014-2020, UC Regents
+Copyright (c) 2020-2021, Alliance for Sustainable 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:
 
-1. Redistributions of source code must retain the above copyright notice, this
-   list of conditions and the following disclaimer.
+* 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.
+* 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 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.
+* 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

diff --git a/ThirdPartyContributors.md b/ThirdPartyContributors.md
@@ -0,0 +1,16 @@
+Copyright (c) 2014-2020, UC Regents
+
+From its inception to mid-2020, this project was supported by Prof. David
+Culler and Prof. Randy Katz at UC Berkeley through various grants.
+
+In addition to NSF CISE Expeditions Award CCF-1730628, this research was
+supported in part by gifts from Alibaba, Amazon Web Services, Ant Financial,
+Arm, CapitalOne, Ericsson, Facebook, Google, Huawei, Intel, Microsoft,
+Scotiabank, Splunk and VMware. This work was also supported in part by the
+CONIX Research Center, one of six centers in JUMP, a Semiconductor Research
+Corporation (SRC) program sponsored by DARPA.
+
+Contributions owned by their respective contributors.
+
+This project would not be possible without contributors (code, documentation,
+issues, ideas) from across the world. Thank you!