Skip to content

Commit

Permalink
Merge pull request #274 from lukpueh/update-repo-metadata
Browse files Browse the repository at this point in the history
Update repo metadata
  • Loading branch information
reza-curtmola committed Apr 11, 2019
2 parents 3122a5c + 4052340 commit cc8e75a
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 16 deletions.
21 changes: 12 additions & 9 deletions ACKNOWLEDGEMENTS.md
Original file line number Diff line number Diff line change
@@ -1,10 +1,13 @@
This project is managed by Prof. Justin Cappos and other members of the
[Secure Systems Lab](https://ssl.engineering.nyu.edu/) at NYU and the
[NJIT Cybersecurity Research Center](https://centers.njit.edu/cybersecurity).
in-toto is maintained by the [Secure Systems
Lab](https://ssl.engineering.nyu.edu/) at [New York
University](https://engineering.nyu.edu/) as well as researchers from the
[Cybersecurity Research Center](https://centers.njit.edu/cybersecurity/) at the
[New Jersey Institute of Technology](https://www.njit.edu/).

This research was supported by the Defense Advanced Research Projects Agency
(DARPA) and the Air Force Research Laboratory (AFRL). Any opinions, findings,
and conclusions or recommendations expressed in this material are those of the
authors and do not necessarily reflect the views of DARPA and AFRL. The United
States Government is authorized to reproduce and distribute reprints
notwithstanding any copyright notice herein.
This research was supported by the US National Science Foundation (NSF), the
Defense Advanced Research Projects Agency (DARPA) and the Air Force Research
Laboratory (AFRL). Any opinions, findings, and conclusions or recommendations
expressed in this material are those of the authors and do not necessarily
reflect the views of NSF, DARPA and AFRL. The United States Government is
authorized to reproduce and distribute reprints notwithstanding any copyright
notice herein.
5 changes: 3 additions & 2 deletions GOVERNANCE.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,9 @@ guidelines](https://github.com/secure-systems-lab/code-style-guidelines), and
must unit test any new software feature or change. Submitted pull requests
undergo review and automated testing, including, but not limited to:

* Unit and build testing via [Travis CI](https://travis-ci.org/) and
[Tox](https://tox.readthedocs.io/en/latest/)
* Unit and build testing via [Tox](https://tox.readthedocs.io/en/latest/) on
[Travis CI](https://travis-ci.org/in-toto/in-toto) and
[AppVeyor](https://ci.appveyor.com/project/in-toto/in-toto)
* Static code analysis via [Pylint](https://www.pylint.org/) and
[Bandit](https://wiki.openstack.org/wiki/Security/Projects/Bandit)
* Review by one or more maintainers
Expand Down
5 changes: 0 additions & 5 deletions MAINTAINERS.txt
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,6 @@ Maintainers:
GitHub username: @SantiagoTorres
PGP fingerprint: 903B AB73 640E B6D6 5533 EFF3 468F 122C E816 2295

Vladimir Diaz
Email: vladimir.diaz@nyu.edu
GitHub username: @vladimir-v-diaz
PGP fingerprint: 3E87 BB33 9378 BC7B 3DD0 E5B2 5DEE 9B97 B0E2 289A

Sebastien Awwad
Email: sebastien.awwad@nyu.edu
GitHub username: @awwad
Expand Down

0 comments on commit cc8e75a

Please sign in to comment.