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.

Sign up for GitHub

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

Jump to bottom

Fix routes for redhat < 6 #32682

Merged
merged 1 commit into from Apr 19, 2016
Merged

Fix routes for redhat < 6 #32682

merged 1 commit into from Apr 19, 2016

Conversation

captaininspiration
Copy link
Contributor

Fix routes for redhat < 6 - choose the right template.

grains['osrelease'][0] is a string... therefore the condition does not work:

>>> "5" < 6
False

Can you backport to 2015.8 (cherry-pick)?

Thank you

@cachedout cachedout merged commit 8c0858a into saltstack:develop Apr 19, 2016
@cachedout
Copy link
Contributor

Good catch. Thanks, @captaininspiration

@captaininspiration captaininspiration mentioned this pull request Apr 19, 2016
Merged
@rallytime rallytime added bugfix-bckport will be be back-ported to an older release branch by creating a PR against that branch ZZZ[Done]-back-ported-bf RETIRED The pull request has been back-ported to an older branch. and removed bugfix-bckport will be be back-ported to an older release branch by creating a PR against that branch labels Apr 19, 2016
gitebra pushed a commit to gitebra/salt that referenced this pull request Apr 21, 2016
@jojohans
Merge remote-tracking branch 'upstream/develop' into develop
6c48707 
* upstream/develop:
  Fix docstring typo/formatting (saltstack#32726)
  Skip utils_test if timelib is not installed (saltstack#32699)
  Handle the situation when the beacon is not configured and we try to disable it (saltstack#32695)
  Allow EC2 userdata to be templated (saltstack#32698)
  Catch up the conf/master file to include gitfs/git_pillar parms from recent releases
  Make example top file match templated version
  Fix whitespace for saltstack#32689
  Fix lint added version info
  Added an app pool restart command
  Update intro_scale.rst
  Fix routes for redhat < 6 (saltstack#32682)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
ZZZ[Done]-back-ported-bf RETIRED The pull request has been back-ported to an older branch.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@captaininspiration @cachedout @rallytime