aboutsummaryrefslogtreecommitdiff
path: root/NOTICE.txt
diff options
context:
space:
mode:
authorCarl Mastrangelo <notcarl@google.com>2017-05-31 13:29:01 -0700
committerGitHub <noreply@github.com>2017-05-31 13:29:01 -0700
commit3bfd630bff54bda45559f8e9b585b4450ef5d31b (patch)
treec14ca04acf4b5a3462f65e301c6ba41240c15c68 /NOTICE.txt
parent8a1217d9727781601f1ad29e9f26990c087c7525 (diff)
downloadgrpc-grpc-java-3bfd630bff54bda45559f8e9b585b4450ef5d31b.tar.gz
all: update to Apache 2 licence
Also, update the authors.
Diffstat (limited to 'NOTICE.txt')
-rw-r--r--NOTICE.txt41
1 files changed, 13 insertions, 28 deletions
diff --git a/NOTICE.txt b/NOTICE.txt
index e2f96722a..e4be9bf96 100644
--- a/NOTICE.txt
+++ b/NOTICE.txt
@@ -1,31 +1,16 @@
-Copyright 2014, Google Inc. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
- * Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
- * 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.
-
- * Neither the name of Google Inc. 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 IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR 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.
+Copyright 2014, gRPC Authors All rights reserved.
+
+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.
-----------------------------------------------------------------------