Merge pull request #1520 from beav/mergedoc

closes #84 Updates to merge process
pulp · Jan 16, 2015 · 34e8ade · 34e8ade
2 parents f722d53 + 84e9da1
commit 34e8ade
Show file tree

Hide file tree

Showing 6 changed files with 440 additions and 54 deletions.
diff --git a/docs/dev-guide/contributing/dev_setup.rst b/docs/dev-guide/contributing/dev_setup.rst
@@ -60,9 +60,9 @@ the latest dependencies according to the spec file.
 
 #. Install some additional dependencies for development::
    
-   $ sudo yum install python-setuptools redhat-lsb mongodb mongodb-server \
-          qpid-cpp-server qpid-cpp-server-store python-qpid-qmf python-nose \
-          python-mock python-paste python-pip
+        $ sudo yum install python-setuptools redhat-lsb mongodb mongodb-server \
+        qpid-cpp-server qpid-cpp-server-store python-qpid-qmf python-nose \
+        python-mock python-paste python-pip
 
 The only caveat to this approach is that these dependencies will need to be maintained after this
 initial setup. Leaving the testing builds repository enabled will cause them to be automatically

diff --git a/docs/dev-guide/contributing/images/pulp-branches.svg b/docs/dev-guide/contributing/images/pulp-branches.svg
diff --git a/docs/dev-guide/contributing/images/pulp-merging.png b/docs/dev-guide/contributing/images/pulp-merging.png