Skip to content

Conversation

@aboe76
Copy link
Contributor

@aboe76 aboe76 commented Feb 10, 2019

Update map.jinja with better merging.
Update README for style guide references
Updated VERSION and CHANGELOG file

@@ -1,2 +1,2 @@
# should contain the currently released version of the formula
1.0.0
0.1.0
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

0.1.1 to match the value in CHANGELOG.rst.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yeah but I need to have a commit hash to make a tag.. I think........

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

But when this is merged, it will be v0.1.1.

@@ -1,6 +1,31 @@
template formula
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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/?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I pushed the tags myself. :)

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

thats on the todo list...I hope....

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@aboe76 Yes, I've already pulled and appreciated the tags in gitk! Looks great, thanks for running with that.

@aboe76 aboe76 requested a review from javierbertoli February 10, 2019 22:21
@javierbertoli javierbertoli merged commit 92f0b8c into saltstack-formulas:master Feb 10, 2019
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
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants