Skip to content

Commit 54fbcce

Browse files
authored
Merge pull request #424 from alexv-smirnov/license1
Update LICENSE and CONTRIBUTING.md
2 parents 871ba6b + 9c5a044 commit 54fbcce

File tree

3 files changed

+14
-30
lines changed

3 files changed

+14
-30
lines changed

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
I hereby agree to the terms of the CLA available at: https://yandex.ru/legal/cla/?lang=en
2-
31
<!--- Please provide a general summary of your changes in the title above -->
42

53
## Pull request type

CONTRIBUTING.md

Lines changed: 12 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,22 @@
11
# Notice to external contributors
22

3+
## Common
34

4-
## General info
5+
YDB is a free and open project and we appreciate to receive contributions from our community.
56

6-
Hello! In order for us (YANDEX LLC) to accept patches and other contributions from you, you will have to adopt our Yandex Contributor License Agreement (the “**CLA**”). The current version of the CLA you may find here:
7-
1) https://yandex.ru/legal/cla/?lang=en (in English) and
8-
2) https://yandex.ru/legal/cla/?lang=ru (in Russian).
7+
## Contributing code changes
98

10-
By adopting the CLA, you state the following:
9+
If you would like to contribute a new feature or a bug fix, please discuss your idea first on the GitHub issue.
10+
If there is no issue for your idea, please open one. It may be that somebody is already working on it,
11+
or that there are some complex obstacles that you should know about before starting the implementation.
12+
Usually there are several ways to fix a problem and it is important to find the right approach before spending time on a PR
13+
that cannot be merged.
1114

12-
* You obviously wish and are willingly licensing your contributions to us for our open source projects under the terms of the CLA,
13-
* You has read the terms and conditions of the CLA and agree with them in full,
14-
* You are legally able to provide and license your contributions as stated,
15-
* We may use your contributions for our open source projects and for any other our project too,
16-
* We rely on your assurances concerning the rights of third parties in relation to your contributes.
15+
## Provide a contribution
1716

18-
If you agree with these principles, please read and adopt our CLA. By providing us your contributions, you hereby declare that you has already read and adopt our CLA, and we may freely merge your contributions with our corresponding open source project and use it in further in accordance with terms and conditions of the CLA.
19-
20-
## Provide contributions
21-
22-
If you have already adopted terms and conditions of the CLA, you are able to provide your contributes. When you submit your pull request, please add the following information into it:
23-
24-
```
25-
I hereby agree to the terms of the CLA available at: [link].
26-
```
27-
28-
Replace the bracketed text as follows:
29-
* [link] is the link at the current version of the CLA (you may add here a link https://yandex.ru/legal/cla/?lang=en (in English) or a link https://yandex.ru/legal/cla/?lang=ru (in Russian).
30-
31-
It is enough to provide us such notification at once.
17+
To make a contribution you should submit a pull request. There will probably be discussion about the pull request and,
18+
if any changes are needed, we would love to work with you to get your pull request merged.
3219

3320
## Other questions
3421

35-
If you have any questions, please mail us at opensource@yandex-team.ru.
22+
If you have any questions, please mail us at info@ydb.tech.

LICENSE

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
Copyright 2022 YANDEX LLC
2-
Apache License
1+
Apache License
32
Version 2.0, January 2004
43
http://www.apache.org/licenses/
54

@@ -187,7 +186,7 @@ Copyright 2022 YANDEX LLC
187186
same "printed page" as the copyright notice for easier
188187
identification within third-party archives.
189188

190-
Copyright 2022 YANDEX LLC
189+
Copyright 2022-2024 YANDEX LLC
191190

192191
Licensed under the Apache License, Version 2.0 (the "License");
193192
you may not use this file except in compliance with the License.

0 commit comments

Comments
 (0)