From e87f634b0fdae89eef53d0736769641e717390a6 Mon Sep 17 00:00:00 2001 From: Prashanth Pai Date: Wed, 8 Oct 2014 10:53:57 -0400 Subject: [PATCH] doc: Update merge requirements. Change-Id: Ief6f19b1e28fbfafa3bade8f44faf6b66eea1e92 Signed-off-by: Prashanth Pai --- doc/markdown/dev_guide.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/doc/markdown/dev_guide.md b/doc/markdown/dev_guide.md index 0b32754..783c513 100644 --- a/doc/markdown/dev_guide.md +++ b/doc/markdown/dev_guide.md @@ -200,10 +200,14 @@ to Gerrit using the following command: git review ~~~ -If 'all goes well' your change will be merged to project swiftonfile. What 'all goes well' means, is this: +Your change will be merged after: 1. Jenkins passes unit tests and functional tests. 2. Two core reviewers give +2. +3. A core reviewer gives a '+1 Approved' for Workflow. + +Gerrit will automatically merge the change only after a '+1 Approved' +for Workflow has been set by one of the core reviewers. [OpenStack Gerrit Workflow]: https://wiki.openstack.org/wiki/Gerrit_Workflow [SSH key]: http://review.openstack.org/#/settings/ssh-keys