Merge branch 'configurable_scheduler' into 'master'

Configurable scheduler method

See merge request !401
.gitlab-ci.yml not found in this commit
Status Job ID Name Coverage
  External
passed cloud