Process/check travis 23 merge 22 (!122) · Merge requests · ensembl-gh-mirror / ensembl-hive

Created by: ens-bwalts

Requirements

Filling out the template is required. Any pull request that does not include enough information to be reviewed in a timely manner may be closed at the maintainers' discretion;
Review the development guidelines for eHive; remember in particular:
- Do not modify code without testing for regression.
- Provide simple unit tests to test the changes.
- If you change the database schema, please follow the instructions for schema changes in the developer guidelines.
- If you change the schema, meadow, or guest language interfaces, please follow the scheme for internal versioning in the developer guidelines.
- The PR must not fail unit testing.

This is part of a cascade-merge of changes, primarily to testing configurations, from version/2.2 up to master.

Created a branch to force a Travis check on changes to .travis.yml created when resolving merge conflicts.

This PR provides an opportunity to sanity check the merge conflict resolution.

Incorporation of these changes will be via pushing the cascade merge to the repo directly, per eHive's exception to SOP

Have you added/modified unit tests to test the changes?

N/A If so, do the tests pass/fail?

Pass Have you run the entire test suite and no regression was detected?

Travis builds run as required.