Merge branch 'master' of github.com:plone/jenkins.plone.org

plone · Feb 15, 2015 · 6fa6d43 · 6fa6d43
2 parents d120096 + 40c52cd
commit 6fa6d43
Show file tree

Hide file tree

Showing 7 changed files with 1 addition and 169 deletions.
diff --git a/docs/source/setup.rst b/docs/source/setup.rst
@@ -65,15 +65,6 @@ Put jenkins-job-builder in development mode::
   $ cd src/jenkins-job-builder
   $ python setup.py develop
 
-Put this repository also on development mode::
-
-  $ cd ../..  # go back to the root
-  $ python setup.py develop
-
-.. note::
-   Activate first jenkins-job-builder **and** later jenkins.plone.org so that
-   you don't end up with two versions of jenkins-job-builder on the virtualenv.
-
 Test the jobs are properly setup::
 
   $ jenkins-jobs --conf jenkins.ini.in test jobs.yml -o output

diff --git a/setup.py b/setup.py
diff --git a/src/jenkins-job-builder b/src/jenkins-job-builder
diff --git a/src/jenkins_builder/__init__.py b/src/jenkins_builder/__init__.py
diff --git a/src/jenkins_builder/properties.py b/src/jenkins_builder/properties.py
diff --git a/src/jenkins_builder/publishers.py b/src/jenkins_builder/publishers.py
diff --git a/src/jenkins_builder/wrappers.py b/src/jenkins_builder/wrappers.py