From 294fcb543e4bf8d8d36832e9071ef0f6b1c9423e Mon Sep 17 00:00:00 2001 From: Brian Behlendorf Date: Tue, 30 Apr 2019 10:58:45 -0700 Subject: [PATCH] Add CODE_OF_CONDUCT.md Signed-off-by: Matthew Ahrens Signed-off-by: Brian Behlendorf Closes #8660 --- CODE_OF_CONDUCT.md | 2 ++ Makefile.am | 1 + 2 files changed, 3 insertions(+) create mode 100644 CODE_OF_CONDUCT.md diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md new file mode 100644 index 0000000000..d314a66b4e --- /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 02e1044348..b4416c7492 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