diff options
author | Jan Tattermusch <jtattermusch@google.com> | 2017-06-07 10:23:56 +0200 |
---|---|---|
committer | Jan Tattermusch <jtattermusch@google.com> | 2017-06-08 11:22:41 +0200 |
commit | 4d5c3102a1b1bd440f22d4889e3afd146997fb6d (patch) | |
tree | a74ddaa1fced8aa72dc2ba24c2bb1caac0307f4c /src/core | |
parent | 7897ae9308a25a064ee2e7386da25d37cc3273fa (diff) |
fix remaining license notices
Diffstat (limited to 'src/core')
-rw-r--r-- | src/core/ext/census/README.md | 35 | ||||
-rw-r--r-- | src/core/tsi/test_creds/BUILD | 2 |
2 files changed, 11 insertions, 26 deletions
diff --git a/src/core/ext/census/README.md b/src/core/ext/census/README.md index fb615a2194..a9826fe889 100644 --- a/src/core/ext/census/README.md +++ b/src/core/ext/census/README.md @@ -1,32 +1,17 @@ <!--- - * Copyright 2015, Google Inc. - * All rights reserved. + * Copyright 2015 gRPC authors. * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are - * met: + * 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 * - * * 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. + * http://www.apache.org/licenses/LICENSE-2.0 * - * 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. + * 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. --> # Census - a resource measurement and tracing system diff --git a/src/core/tsi/test_creds/BUILD b/src/core/tsi/test_creds/BUILD index ee63470936..4b0786d7b8 100644 --- a/src/core/tsi/test_creds/BUILD +++ b/src/core/tsi/test_creds/BUILD @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -licenses(["notice"]) # 3-clause BSD +licenses(["notice"]) # Apache v2 exports_files([ "ca.pem", |