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

Updated map.jinja for archlinux package convention #90

Merged
merged 2 commits into from
Feb 5, 2015
Merged

Updated map.jinja for archlinux package convention #90

merged 2 commits into from
Feb 5, 2015

Conversation

aboe76
Copy link
Member

@aboe76 aboe76 commented Jan 13, 2015

Archlinux has salt-raet or salt-zmq in repository, I have choosen salt-zmq as default in map.jinja

Improved the override function without the base='default' parameter, so to be backward compatible to 0.17 salt version see pillar.example for lookup function override.

@aboe76
Copy link
Member Author

aboe76 commented Feb 5, 2015

@nmadhok could you take a look at this, and see if can be merged? I have some other pull request that I want to do to this module.

nmadhok added a commit that referenced this pull request Feb 5, 2015
Updated map.jinja for archlinux package convention
@nmadhok nmadhok merged commit f39fff2 into saltstack-formulas:master Feb 5, 2015
@nmadhok
Copy link
Member

nmadhok commented Feb 5, 2015

@aboe76 Excellent changes! Thanks!

@aboe76
Copy link
Member Author

aboe76 commented Feb 5, 2015

@nmadhok thanks for the quick merge.

@nmadhok
Copy link
Member

nmadhok commented Feb 6, 2015

@aboe76 not a problem!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants