summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGiuseppe Di Natale <[email protected]>2017-06-15 17:52:18 -0700
committerBrian Behlendorf <[email protected]>2017-06-15 17:52:18 -0700
commit05a5357a6c63b8c83062c1b295ee98d14f8e85aa (patch)
tree21586797d43ac0a25ffc660586130de458b44d5c
parentef4be34a64010fb57632e1bc317810c86feacc67 (diff)
Provide links to info about ZFS Buildbot options
Add links for information about the ZFS buildbot options to the contributing guidelines and PR template. Reviewed-by: Brian Behlendorf <[email protected]> Signed-off-by: Giuseppe Di Natale <[email protected]> Closes #6235
-rw-r--r--.github/CONTRIBUTING.md2
-rw-r--r--.github/PULL_REQUEST_TEMPLATE.md6
2 files changed, 8 insertions, 0 deletions
diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md
index 46923b5ee..c2a5e6a13 100644
--- a/.github/CONTRIBUTING.md
+++ b/.github/CONTRIBUTING.md
@@ -136,6 +136,8 @@ Buildbot](http://build.zfsonlinux.org/) builders before
being accepted. If you are experiencing intermittent TEST
builder failures, you may be experiencing a [test suite
issue](https://github.com/zfsonlinux/zfs/issues?q=is%3Aissue+is%3Aopen+label%3A%22Test+Suite%22).
+There are also various [buildbot options](https://github.com/zfsonlinux/zfs/wiki/Buildbot-Options)
+to control how changes are tested.
* All proposed changes must be approved by a ZFS on Linux organization member.
### Testing
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index d577aaabe..7bad053f8 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -1,5 +1,10 @@
<!--- Provide a general summary of your changes in the Title above -->
+<!---
+Documentation on ZFS Buildbot options can be found at
+https://github.com/zfsonlinux/zfs/wiki/Buildbot-Options
+-->
+
### Description
<!--- Describe your changes in detail -->
@@ -20,6 +25,7 @@
- [ ] Performance enhancement (non-breaking change which improves efficiency)
- [ ] Code cleanup (non-breaking change which makes code smaller or more readable)
- [ ] Breaking change (fix or feature that would cause existing functionality to change)
+- [ ] Documentation (a change to man pages or other documentation)
### Checklist:
<!--- Go over all the following points, and put an `x` in all the boxes that apply. -->