summaryrefslogtreecommitdiff
path: root/docs/dev
diff options
context:
space:
mode:
authorKali Kaneko <kali@leap.se>2015-08-31 14:54:52 -0400
committerKali Kaneko <kali@leap.se>2015-08-31 14:54:52 -0400
commitf4547479fc050f338845f4f546d8dd7c0e4512eb (patch)
tree0f737c7f102674230f5467ecaf17720e1d28f6eb /docs/dev
parentdd43dad4b150adb66e571a56a8a5c053dec858d0 (diff)
parentfd27f48a35736d8ba186c423a7de15ffee5143dd (diff)
Merge tag '0.9.0rc2' into debian/experimental
Tag leap.bitmask version 0.9.0rc2
Diffstat (limited to 'docs/dev')
-rw-r--r--docs/dev/workflow.rst2
1 files changed, 1 insertions, 1 deletions
diff --git a/docs/dev/workflow.rst b/docs/dev/workflow.rst
index f217df24..689b8feb 100644
--- a/docs/dev/workflow.rst
+++ b/docs/dev/workflow.rst
@@ -48,7 +48,7 @@ All code ready to be merged into the integration branch is expected to:
* Have tests
* Be documented
-* Pass existing tests: do **run_tests.sh** and **tox -v**. All feature branches are automagically built by our `buildbot farm <http://lemur.leap.se:8010/grid>`_. So please check your branch is green before merging it it to `develop`. Rebasing against the current tip of the integration when possible is preferred in order to keep a clean history.
+* Pass existing tests: do **run_tests.sh** and **tox -v**. Rebasing against the current tip of the integration when possible is preferred in order to keep a clean history.
Using Github
------------