Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Added test and extra if conditional to fix #4959 #4967

Merged
merged 1 commit into from Jul 10, 2019

Conversation

@moosilauke18
Copy link
Contributor

commented Jun 17, 2019

Fixes issue with #4959 where dayofmonth is not null, it is ?, but it sets dayofweek to also be ?.

It simply looks if dayofmonth is set to ?. If it is, then it goes to the next if.

@moosilauke18 moosilauke18 force-pushed the moosilauke18:fix-schedule-dayofweek branch from 7a66331 to 0812775 Jun 17, 2019

@moosilauke18 moosilauke18 changed the title Added test and extra if to fix #4959 Added test and extra if conditional to fix #4959 Jun 17, 2019

@gschueler

This comment has been minimized.

Copy link
Member

commented Jun 18, 2019

thanks!

@gschueler

This comment has been minimized.

Copy link
Member

commented Jun 18, 2019

I think this has never come up before because in normal usage, the <day day="?"/> would not be added to exported xml when <weekday ..> is included, and the import would succeed if the <day .../> is not present. the terraform provider always generates that element

@gschueler gschueler added this to the 3.1.0-RC2 milestone Jun 24, 2019

@gschueler gschueler merged commit 9d95dfa into rundeck:master Jul 10, 2019

20 checks passed

Mergeable Mergeable Run has been Completed!
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
security/snyk - build.gradle (rundeck) No manifest changes detected
security/snyk - core/build.gradle (rundeck) No manifest changes detected
security/snyk - plugins/build.gradle (rundeck) No manifest changes detected
security/snyk - plugins/copyfile-plugin/build.gradle (rundeck) No manifest changes detected
security/snyk - plugins/flow-control-plugin/build.gradle (rundeck) No manifest changes detected
security/snyk - plugins/git-plugin/build.gradle (rundeck) No manifest changes detected
security/snyk - plugins/jasypt-encryption-plugin/build.gradle (rundeck) No manifest changes detected
security/snyk - plugins/job-state-plugin/build.gradle (rundeck) No manifest changes detected
security/snyk - plugins/localexec-plugin/build.gradle (rundeck) No manifest changes detected
security/snyk - plugins/orchestrator-plugin/build.gradle (rundeck) No manifest changes detected
security/snyk - plugins/script-plugin/build.gradle (rundeck) No manifest changes detected
security/snyk - plugins/source-refresh-plugin/build.gradle (rundeck) No manifest changes detected
security/snyk - plugins/stub-plugin/build.gradle (rundeck) No manifest changes detected
security/snyk - plugins/upvar-plugin/build.gradle (rundeck) No manifest changes detected
security/snyk - rundeck-storage/build.gradle (rundeck) No manifest changes detected
security/snyk - rundeckapp/build.gradle (rundeck) No manifest changes detected
security/snyk - rundeckapp/grails-spa/package.json (rundeck) No manifest changes detected
security/snyk - rundeckapp/metricsweb/build.gradle (rundeck) No manifest changes detected
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
2 participants
You can’t perform that action at this time.