Skip to content

Commit 91fcbb6

Browse files
authored
Cleanup contribution, license and third-party license files (#277)
* Cleanup contribution, license and third-party license files across the repo. Signed-off-by: Avi Miller <[email protected]>
1 parent afa84c8 commit 91fcbb6

22 files changed

+16
-913
lines changed

CONTRIBUTING.md

+15-16
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,36 @@
1-
# Contributing
1+
# Contributing to the Oracle Vagrant Projects repository
2+
23
Oracle welcomes contributions to this repository from anyone.
34

45
If you want to submit a pull request to fix a bug or enhance an existing
5-
`Vagrantfile`, please first open an issue and link to that issue when you
6-
submit your pull request.
6+
`Vagrantfile` or associated script, please first open an issue and link to that
7+
issue when you submit your pull request.
78

89
If you have any questions about a possible submission, feel free to open
910
an issue too.
1011

11-
## Contributing to the Oracle Vagrant Boxes repository
12-
13-
Pull requests can be made under
14-
[The Oracle Contributor Agreement](https://www.oracle.com/technetwork/community/oca-486395.html) (OCA).
12+
All pull requests require the contributor to have agreed to and signed the
13+
[Oracle Contributor Agreement](https://www.oracle.com/technetwork/community/oca-486395.html) (OCA).
1514

1615
For pull requests to be accepted, the bottom of your commit message must have
1716
the following line using your name and e-mail address as it appears in the
18-
OCA Signatories list.
17+
OCA signatories list.
1918

20-
```
19+
```shell
2120
Signed-off-by: Your Name <[email protected]>
2221
```
2322

24-
This can be automatically added to pull requests by committing with:
23+
This can be automatically added to pull requests by providing the `--signoff`
24+
or `-s` parameter when commiting:
2525

26-
```
26+
```shell
2727
git commit --signoff
2828
```
2929

30-
Only pull requests from committers that can be verified as having
31-
signed the OCA can be accepted.
30+
Only pull requests from committers that can be verified as having signed the OCA
31+
can be accepted.
3232

33-
### Pull request process
33+
## Pull request process
3434

3535
1. Fork this repository
3636
1. Create a branch in your fork to implement the changes. We recommend using
@@ -43,5 +43,4 @@ what your changes are meant to do and provide simple steps on how to validate
4343
your changes. Ensure that you reference the issue you created as well.
4444
We will assign the pull request to 2-3 people for review before it is merged.
4545

46-
47-
*Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.*
46+
Copyright (c) 2018, 2020 Oracle and/or its affiliates.

ContainerTools/LICENSE

-27
This file was deleted.

DockerEngine/LICENSE

-27
This file was deleted.

Kubernetes/LICENSE

-27
This file was deleted.

LAMP/LICENSE

-27
This file was deleted.

LICENSE

-27
This file was deleted.

OLCNE/LICENSE renamed to LICENSE.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Copyright (c) 2019 Oracle and/or its affiliates.
1+
Copyright (c) 2020 Oracle and/or its affiliates.
22

33
The Universal Permissive License (UPL), Version 1.0
44

OLCNE/CONTRIBUTING.md

-38
This file was deleted.

OracleAPEX/LICENSE.txt

-27
This file was deleted.

0 commit comments

Comments
 (0)