Skip to content

Process/check travis 23 merge 22

Marek Szuba requested to merge process/check_travis_23-merge-22 into version/2.3

Created by: ens-bwalts


  • 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:


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

Possible Drawbacks


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.

Merge request reports