diff options
| author | Brian Behlendorf <[email protected]> | 2019-04-30 10:58:45 -0700 |
|---|---|---|
| committer | GitHub <[email protected]> | 2019-04-30 10:58:45 -0700 |
| commit | 294fcb543e4bf8d8d36832e9071ef0f6b1c9423e (patch) | |
| tree | 7ef422a927913f9e8b080677115f7cbb8416c8d3 | |
| parent | c12ea778654778f2039369323e8875e71d3a5609 (diff) | |
Add CODE_OF_CONDUCT.md
Signed-off-by: Matthew Ahrens <[email protected]>
Signed-off-by: Brian Behlendorf <[email protected]>
Closes #8660
| -rw-r--r-- | CODE_OF_CONDUCT.md | 2 | ||||
| -rw-r--r-- | Makefile.am | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md new file mode 100644 index 000000000..d314a66b4 --- /dev/null +++ b/CODE_OF_CONDUCT.md @@ -0,0 +1,2 @@ +The [OpenZFS Code of Conduct](http://www.open-zfs.org/wiki/Code_of_Conduct) +applies to spaces associated with the ZFS on Linux project, including GitHub. diff --git a/Makefile.am b/Makefile.am index 02e104434..b4416c749 100644 --- a/Makefile.am +++ b/Makefile.am @@ -22,6 +22,7 @@ AUTOMAKE_OPTIONS = foreign EXTRA_DIST = autogen.sh copy-builtin EXTRA_DIST += config/config.awk config/rpm.am config/deb.am config/tgz.am EXTRA_DIST += META AUTHORS COPYRIGHT LICENSE NEWS NOTICE README.md +EXTRA_DIST += CODE_OF_CONDUCT.md # Include all the extra licensing information for modules EXTRA_DIST += module/icp/algs/skein/THIRDPARTYLICENSE module/icp/algs/skein/THIRDPARTYLICENSE.descrip |