Merge pull request #1943 from sivel/rebase-prs

Rebase PRs against $TRAVIS_BRANCH before performing tests

Author: sivel

.travis.yml

@@ -9,6 +9,10 @@ addons:
     packages:
       - python2.4
       - python2.6
+before_install:
+  - git config user.name "ansible"
+  - git config user.email "[email protected]"
+  - if [[ "$TRAVIS_PULL_REQUEST" != "false" ]]; then git rebase $TRAVIS_BRANCH; fi;
 install:
   - pip install git+https://github.com/ansible/ansible.git@devel#egg=ansible
   - pip install git+https://github.com/sivel/ansible-testing.git#egg=ansible_testing