Skip to content

Commit d16de31

Browse files
authoredSep 9, 2017
Update to Apache 2.0 License (jaegertracing#391)
* Update to Apache 2.0 License Per https://github.com/uber/jaeger/issues/252 * update in actual files
1 parent f0193c6 commit d16de31

File tree

322 files changed

+3102
-4802
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

322 files changed

+3102
-4802
lines changed
 

‎CHANGELOG.md

+6
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,12 @@
11
Changes by Version
22
==================
33

4+
0.8.0 (unreleased)
5+
------------------
6+
7+
- Convert to Apache 2.0 License
8+
9+
410
0.7.0 (2017-08-22)
511
------------------
612

‎CONTRIBUTING.md

+10-17
Original file line numberDiff line numberDiff line change
@@ -95,30 +95,23 @@ pull request is most likely to be accepted if it:
9595
## License
9696

9797
By contributing your code, you agree to license your contribution under the terms
98-
of the [MIT License](LICENSE).
98+
of the [Apache License](LICENSE).
9999

100100
If you are adding a new file it should have a header like below. The easiest
101101
way to add such header is to run `make fmt`.
102102

103103
```
104104
// Copyright (c) 2017 Uber Technologies, Inc.
105105
//
106-
// Permission is hereby granted, free of charge, to any person obtaining a copy
107-
// of this software and associated documentation files (the "Software"), to deal
108-
// in the Software without restriction, including without limitation the rights
109-
// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
110-
// copies of the Software, and to permit persons to whom the Software is
111-
// furnished to do so, subject to the following conditions:
106+
// Licensed under the Apache License, Version 2.0 (the "License");
107+
// you may not use this file except in compliance with the License.
108+
// You may obtain a copy of the License at
112109
//
113-
// The above copyright notice and this permission notice shall be included in
114-
// all copies or substantial portions of the Software.
110+
// http://www.apache.org/licenses/LICENSE-2.0
115111
//
116-
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
117-
// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
118-
// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
119-
// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
120-
// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
121-
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
122-
// THE SOFTWARE.
112+
// Unless required by applicable law or agreed to in writing, software
113+
// distributed under the License is distributed on an "AS IS" BASIS,
114+
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
115+
// See the License for the specific language governing permissions and
116+
// limitations under the License.
123117
```
124-

0 commit comments

Comments
 (0)