update formula with map.jinja and style guide references, improve REA…#20
Merged
javierbertoli merged 2 commits intoFeb 10, 2019
Conversation
added 2 commits
February 10, 2019 22:47
myii
reviewed
Feb 10, 2019
| @@ -1,2 +1,2 @@ | |||
| # should contain the currently released version of the formula | |||
| 1.0.0 | |||
| 0.1.0 | |||
Contributor
Author
There was a problem hiding this comment.
yeah but I need to have a commit hash to make a tag.. I think........
Contributor
There was a problem hiding this comment.
But when this is merged, it will be v0.1.1.
myii
reviewed
Feb 10, 2019
| @@ -1,6 +1,31 @@ | |||
| template formula | |||
Contributor
There was a problem hiding this comment.
Excellent, tagging releases has already started! May I recommend standardising our changelogs according to the format set out at https://keepachangelog.com/en/1.0.0/?
Contributor
Author
There was a problem hiding this comment.
I pushed the tags myself. :)
Contributor
Author
There was a problem hiding this comment.
thats on the todo list...I hope....
Contributor
There was a problem hiding this comment.
@aboe76 Yes, I've already pulled and appreciated the tags in gitk! Looks great, thanks for running with that.
71 tasks
myii
added a commit
to myii/template-formula
that referenced
this pull request
May 1, 2019
* Fix 5dc0b86 in saltstack-formulas#95 - No option `merge=True` for `config.get` * Use `pillar.get` for `salt-call` (i.e. `salt-ssh`) * Use `config.get` via. `defaults.merge` otherwise - Reintroduce based on 775a930 in saltstack-formulas#20
myii
added a commit
to myii/template-formula
that referenced
this pull request
May 6, 2019
* Fix 5dc0b86 in saltstack-formulas#95 - No option `merge=True` for `config.get` * Use `pillar.get` for `salt-call` (i.e. `salt-ssh`) * Use `config.get` via. `defaults.merge` otherwise - Reintroduce based on 775a930 in saltstack-formulas#20
myii
added a commit
to myii/template-formula
that referenced
this pull request
May 12, 2019
* Fix 5dc0b86 in saltstack-formulas#95 - No option `merge=True` for `config.get` * Use `pillar.get` for `salt-call` (i.e. `salt-ssh`) - Differentiate `salt-ssh`/`salt-call` via. `root_dir` * Use `config.get` via. `defaults.merge` otherwise - Reintroduce based on 775a930 in saltstack-formulas#20
myii
added a commit
to myii/template-formula
that referenced
this pull request
May 13, 2019
* Fix 5dc0b86 in saltstack-formulas#95 - No option `merge=True` for `config.get` * Use `pillar.get` for `salt-call` (i.e. `salt-ssh`) - Differentiate `salt-ssh`/`salt-call` via. `root_dir` * Use `config.get` via. `defaults.merge` otherwise - Reintroduce based on 775a930 in saltstack-formulas#20
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Update map.jinja with better merging.
Update README for style guide references
Updated VERSION and CHANGELOG file