aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFredrik Gustafsson <[email protected]>2013-07-02 10:29:51 +0200
committerFredrik Gustafsson <[email protected]>2013-07-02 10:29:51 +0200
commit2aa252a12f88bcbb928cb1c958684eec6b427739 (patch)
treeaafc7935c60213212ee7f003c16e81a1945add59
parentedaec031fc06bbd6eaacc409fbd43a006f5e3501 (diff)
parent829eb3c3daf82be6777673e87d523ec977e9f196 (diff)
downloadotp-2aa252a12f88bcbb928cb1c958684eec6b427739.tar.gz
otp-2aa252a12f88bcbb928cb1c958684eec6b427739.tar.bz2
otp-2aa252a12f88bcbb928cb1c958684eec6b427739.zip
Merge branch 'maint'
-rw-r--r--README.md11
1 files changed, 7 insertions, 4 deletions
diff --git a/README.md b/README.md
index 1bcf14e760..a6a4f11be8 100644
--- a/README.md
+++ b/README.md
@@ -28,10 +28,13 @@ Here are the [instructions for submitting patches] [2].
In short:
* We prefer to receive proposed updates via email on the
- [`erlang-patches`] [3] mailing list rather than through a pull request.
- Pull requests are not practical because we have a strict policy never to
- merge any untested changes to the development branch (the only exception
- being **obviously** correct changes, such as corrections of typos).
+ [`erlang-patches`] [3] mailing list or through a pull request.
+
+* Pull requests will be handled once everyday and there will be
+ essential testing before we will take a decision on the outcome
+ of the request. If the essential testings fails, the pull request
+ will be closed and you will have to fix the problem and submit another
+ pull request when this is done.
* We merge all proposed updates to the `pu` (*proposed updates*) branch,
typically within one working day.