summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael DeHaan <michael.dehaan@gmail.com>2012-04-24 03:18:57 +0200
committerMichael DeHaan <michael.dehaan@gmail.com>2012-04-24 03:18:57 +0200
commit6ba91a715e8784d7df6f239ab55ef25dc3b6d153 (patch)
tree6505b9c9dfdb1e59b4372707c50786c1f3b318c7
parentVersion bump for 0.3 release (diff)
downloadansible-6ba91a715e8784d7df6f239ab55ef25dc3b6d153.tar.xz
ansible-6ba91a715e8784d7df6f239ab55ef25dc3b6d153.zip
Update README to indicate new branch name
-rw-r--r--README.md6
1 files changed, 3 insertions, 3 deletions
diff --git a/README.md b/README.md
index 35aa82d47e..468eb3192b 100644
--- a/README.md
+++ b/README.md
@@ -30,8 +30,8 @@ Patch Instructions
Contributions to the core and modules are greatly welcome.
* Required Process:
- * Submit github pull requests to the "ansible/integration" branch
- * (This branch will be renamed 'devel' in the very near future)
+ * Submit github pull requests to the "ansible/devel" branch for features
+ * Fixes for bugs may be submitted to "ansible/master"
* Make sure "make tests" passes before submitting any requests.
* Bonus points:
* Joining the mailing list
@@ -40,7 +40,7 @@ Contributions to the core and modules are greatly welcome.
* Adding more unit tests
* Avoid:
* Sending patches to the mailing list directly.
- * Sending pull requests to the 'master' branch instead of the integration branch.
+ * Sending feature pull requests to the 'master' branch instead of the devel branch
* Sending pull requests to mpdehaan's personal ansible fork.
Author