Skip to content

Commit 2b6b498

Browse files
robpikerobpike
committed
Fix the license text in the source files. It was incorrect. Should be all consistent now.
1 parent 3e682cc commit 2b6b498

File tree

3 files changed

+39
-84
lines changed

3 files changed

+39
-84
lines changed

‎glog.go‎

Lines changed: 13 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,18 @@
11
// Go support for leveled logs, analogous to https://code.google.com/p/google-glog/
22
//
3-
// Copyright 2013 The Go Authors. All rights reserved.
4-
// http://github.com/golang/glog
5-
//
6-
// Redistribution and use in source and binary forms, with or without
7-
// modification, are permitted provided that the following conditions are
8-
// met:
9-
//
10-
// * Redistributions of source code must retain the above copyright
11-
// notice, this list of conditions and the following disclaimer.
12-
// * Redistributions in binary form must reproduce the above
13-
// copyright notice, this list of conditions and the following disclaimer
14-
// in the documentation and/or other materials provided with the
15-
// distribution.
16-
// * Neither the name of Google Inc. nor the names of its
17-
// contributors may be used to endorse or promote products derived from
18-
// this software without specific prior written permission.
19-
//
20-
// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
21-
// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
22-
// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
23-
// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
24-
// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
25-
// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
26-
// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
27-
// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
28-
// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
29-
// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
30-
// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
3+
// Copyright 2013 Google Inc. All Rights Reserved.
4+
//
5+
// Licensed under the Apache License, Version 2.0 (the "License");
6+
// you may not use this file except in compliance with the License.
7+
// You may obtain a copy of the License at
8+
//
9+
// http://www.apache.org/licenses/LICENSE-2.0
10+
//
11+
// Unless required by applicable law or agreed to in writing, software
12+
// distributed under the License is distributed on an "AS IS" BASIS,
13+
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14+
// See the License for the specific language governing permissions and
15+
// limitations under the License.
3116

3217
// Package glog implements logging analogous to the Google-internal C++ INFO/ERROR/V setup.
3318
// It provides functions Info, Warning, Error, Fatal, plus formatting variants such as

‎glog_file.go‎

Lines changed: 13 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,18 @@
11
// Go support for leveled logs, analogous to https://code.google.com/p/google-glog/
22
//
3-
// Copyright 2013 The Go Authors. All rights reserved.
4-
// http://github.com/golang/glog
5-
//
6-
// Redistribution and use in source and binary forms, with or without
7-
// modification, are permitted provided that the following conditions are
8-
// met:
9-
//
10-
// * Redistributions of source code must retain the above copyright
11-
// notice, this list of conditions and the following disclaimer.
12-
// * Redistributions in binary form must reproduce the above
13-
// copyright notice, this list of conditions and the following disclaimer
14-
// in the documentation and/or other materials provided with the
15-
// distribution.
16-
// * Neither the name of Google Inc. nor the names of its
17-
// contributors may be used to endorse or promote products derived from
18-
// this software without specific prior written permission.
19-
//
20-
// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
21-
// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
22-
// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
23-
// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
24-
// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
25-
// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
26-
// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
27-
// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
28-
// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
29-
// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
30-
// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
3+
// Copyright 2013 Google Inc. All Rights Reserved.
4+
//
5+
// Licensed under the Apache License, Version 2.0 (the "License");
6+
// you may not use this file except in compliance with the License.
7+
// You may obtain a copy of the License at
8+
//
9+
// http://www.apache.org/licenses/LICENSE-2.0
10+
//
11+
// Unless required by applicable law or agreed to in writing, software
12+
// distributed under the License is distributed on an "AS IS" BASIS,
13+
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14+
// See the License for the specific language governing permissions and
15+
// limitations under the License.
3116

3217
// File I/O for logs.
3318

‎glog_test.go‎

Lines changed: 13 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,18 @@
11
// Go support for leveled logs, analogous to https://code.google.com/p/google-glog/
22
//
3-
// Copyright 2013 The Go Authors. All rights reserved.
4-
// http://github.com/golang/glog
5-
//
6-
// Redistribution and use in source and binary forms, with or without
7-
// modification, are permitted provided that the following conditions are
8-
// met:
9-
//
10-
// * Redistributions of source code must retain the above copyright
11-
// notice, this list of conditions and the following disclaimer.
12-
// * Redistributions in binary form must reproduce the above
13-
// copyright notice, this list of conditions and the following disclaimer
14-
// in the documentation and/or other materials provided with the
15-
// distribution.
16-
// * Neither the name of Google Inc. nor the names of its
17-
// contributors may be used to endorse or promote products derived from
18-
// this software without specific prior written permission.
19-
//
20-
// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
21-
// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
22-
// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
23-
// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
24-
// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
25-
// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
26-
// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
27-
// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
28-
// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
29-
// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
30-
// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
3+
// Copyright 2013 Google Inc. All Rights Reserved.
4+
//
5+
// Licensed under the Apache License, Version 2.0 (the "License");
6+
// you may not use this file except in compliance with the License.
7+
// You may obtain a copy of the License at
8+
//
9+
// http://www.apache.org/licenses/LICENSE-2.0
10+
//
11+
// Unless required by applicable law or agreed to in writing, software
12+
// distributed under the License is distributed on an "AS IS" BASIS,
13+
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14+
// See the License for the specific language governing permissions and
15+
// limitations under the License.
3116

3217
package glog
3318

0 commit comments

Comments
 (0)