Skip to content

Commit 13f2a83

Browse files
authored
Merge pull request #101 from oracle/ol-contributions-cla
Update documentation around CLA
2 parents 8a23627 + 9dd7577 commit 13f2a83

File tree

2 files changed

+40
-0
lines changed

2 files changed

+40
-0
lines changed

CONTRIBUTING.md

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
# Contributing to the OCI Cloud Controller Manager
2+
3+
*Copyright (c) 2017 Oracle and/or its affiliates. All rights reserved.*
4+
5+
Pull requests can be made under
6+
[The Oracle Contributor Agreement](https://www.oracle.com/technetwork/community/oca-486395.html)
7+
(OCA).
8+
9+
For pull requests to be accepted, the bottom of
10+
your commit message must have the following line using your name and
11+
e-mail address as it appears in the OCA Signatories list.
12+
13+
```
14+
Signed-off-by: Your Name <[email protected]>
15+
```
16+
17+
This can be automatically added to pull requests by committing with:
18+
19+
```
20+
git commit --signoff
21+
````
22+
23+
Only pull requests from committers that can be verified as having
24+
signed the OCA can be accepted.

README.md

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -144,6 +144,22 @@ See [DEVELOPMENT.md](docs/development.md).
144144

145145
If you think you've found a bug, please [raise an issue][3].
146146

147+
## Contributing
148+
149+
`oci-cloud-controller-manager` is an open source project. See [CONTRIBUTING](CONTRIBUTING.md) for
150+
details.
151+
152+
Oracle gratefully acknowledges the contributions to this project that have been made
153+
by the community.
154+
155+
## License
156+
157+
Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
158+
159+
`oci-cloud-controller-manager` is licensed under the Apache License 2.0.
160+
161+
See [LICENSE](LICENSE) for more details.
162+
147163
[1]: https://cloud.oracle.com/iaas
148164
[2]: https://kubernetes.io/docs/tasks/administer-cluster/running-cloud-controller/
149165
[3]: https://github.com/oracle/oci-cloud-controller-manager/issues/new

0 commit comments

Comments
 (0)