Skip to content

Commit

Permalink
Merge "FAB-4307 add missing CCBY license to all docs"
Browse files Browse the repository at this point in the history
  • Loading branch information
Keith Smith authored and Gerrit Code Review committed Jun 2, 2017
2 parents 5722d96 + 9ce8536 commit 600ddf9
Show file tree
Hide file tree
Showing 9 changed files with 27 additions and 0 deletions.
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -188,3 +188,6 @@ March 16, 2017
* [ffa64c8](https://github.com/hyperledger/fabric/commit/ffa64c8) Add Identity Provider APIs
* [df3844d](https://github.com/hyperledger/fabric/commit/df3844d) Initial COP checkin


<a rel="license" href="http://creativecommons.org/licenses/by/4.0/"><img alt="Creative Commons License" style="border-width:0" src="https://i.creativecommons.org/l/by/4.0/88x31.png" /></a><br />This work is licensed under a <a rel="license" href="http://creativecommons.org/licenses/by/4.0/">Creative Commons Attribution 4.0 International License</a>.
s
3 changes: 3 additions & 0 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,6 @@

This repository is part of the Fabric project.
Please consult [Fabric's CONTRIBUTING documentation](https://github.com/hyperledger/fabric/blob/master/docs/CONTRIBUTING.md) for information on how to contribute to this repository.

<a rel="license" href="http://creativecommons.org/licenses/by/4.0/"><img alt="Creative Commons License" style="border-width:0" src="https://i.creativecommons.org/l/by/4.0/88x31.png" /></a><br />This work is licensed under a <a rel="license" href="http://creativecommons.org/licenses/by/4.0/">Creative Commons Attribution 4.0 International License</a>.
s
3 changes: 3 additions & 0 deletions MAINTAINERS.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,6 @@

This repository is part of the Fabric project.
Please consult [Fabric's MAINTAINERS documentation](https://github.com/hyperledger/fabric/blob/master/docs/MAINTAINERS.md) for the list of people maintaining this repository.

<a rel="license" href="http://creativecommons.org/licenses/by/4.0/"><img alt="Creative Commons License" style="border-width:0" src="https://i.creativecommons.org/l/by/4.0/88x31.png" /></a><br />This work is licensed under a <a rel="license" href="http://creativecommons.org/licenses/by/4.0/">Creative Commons Attribution 4.0 International License</a>.
s
3 changes: 3 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -66,3 +66,6 @@ See [FVT tests](scripts/fvt/README.md) for information on functional verificatio




<a rel="license" href="http://creativecommons.org/licenses/by/4.0/"><img alt="Creative Commons License" style="border-width:0" src="https://i.creativecommons.org/l/by/4.0/88x31.png" /></a><br />This work is licensed under a <a rel="license" href="http://creativecommons.org/licenses/by/4.0/">Creative Commons Attribution 4.0 International License</a>.
s
3 changes: 3 additions & 0 deletions docker/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,3 +20,6 @@ To run the example:
```sh
$ cd path/to/fabric-ca/docker/examples/client-server-flow; docker-compose up
```

<a rel="license" href="http://creativecommons.org/licenses/by/4.0/"><img alt="Creative Commons License" style="border-width:0" src="https://i.creativecommons.org/l/by/4.0/88x31.png" /></a><br />This work is licensed under a <a rel="license" href="http://creativecommons.org/licenses/by/4.0/">Creative Commons Attribution 4.0 International License</a>.
s
3 changes: 3 additions & 0 deletions docker/examples/client-server-flow/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -49,3 +49,6 @@ $ fabric-ca server init /path/to/fabric-ca/config/csr.json
```sh
$ docker-compose -f docker-compose-fabric-ca-cluster.yml up --force-recreate -d
```

<a rel="license" href="http://creativecommons.org/licenses/by/4.0/"><img alt="Creative Commons License" style="border-width:0" src="https://i.creativecommons.org/l/by/4.0/88x31.png" /></a><br />This work is licensed under a <a rel="license" href="http://creativecommons.org/licenses/by/4.0/">Creative Commons Attribution 4.0 International License</a>.
s
2 changes: 2 additions & 0 deletions docs/source/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,5 @@ This build of the docs is from the "|version|" branch

users-guide

.. Licensed under Creative Commons Attribution 4.0 International License
https://creativecommons.org/licenses/by/4.0/
4 changes: 4 additions & 0 deletions docs/source/users-guide.rst
Original file line number Diff line number Diff line change
Expand Up @@ -1562,3 +1562,7 @@ for the Fabric CA server, set the ``db.tls.client.certfile``,
and ``db.tls.client.keyfile`` configuration properties.

`Back to Top`_

.. Licensed under Creative Commons Attribution 4.0 International License
https://creativecommons.org/licenses/by/4.0/
3 changes: 3 additions & 0 deletions scripts/fvt/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -33,3 +33,6 @@ This will build a docker-fvt test image and run all of the currently defined uni

###Creating tests
You may add additional tests (essentially any scripts or executables, in any language, that generates a return code and follows the naming convention `*test.sh`) by placing them in the ``$GOPATH/src/github.com/hyperledger/fabric-ca/scripts/fvt`` directory. You may invoke them directly within an interactive test container, or rely on the image's default command to succesively run all of the tests in the `$GOPATH/src/github.com/hyperledger/fabric-ca/scripts/fvt`` directory. Note that each test in the fvt directory will be run twice: once using TLS and once without using TLS. Consequently, the tests should be written to run in either environment.

<a rel="license" href="http://creativecommons.org/licenses/by/4.0/"><img alt="Creative Commons License" style="border-width:0" src="https://i.creativecommons.org/l/by/4.0/88x31.png" /></a><br />This work is licensed under a <a rel="license" href="http://creativecommons.org/licenses/by/4.0/">Creative Commons Attribution 4.0 International License</a>.
s

0 comments on commit 600ddf9

Please sign in to comment.