Salt/salt-formula
0
0 Fork 0
mirror of https://github.com/saltstack-formulas/salt-formula.git synced 2026-10-23 23:14:05 +02:00
Code Issues Activity
623 Commits 8 Branches 73 Tags
b2d760cd874ea6dc5d3a966a2e5a1622b8b80bb2
Commit Graph
3 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Imran Iqbal 1d9643b14b Merge pull request #395 from aboe76/simplify-map.jinja 
Simplify map.jinja revert deep_merge solution from #193
 2019-01-26 21:54:08 +00:00
myii 784e2bc372 Update pillar.example for single-dir, multi-branch salt_formulas #239 (#373) 
* Also minor unrelated updates/fixes
 2018-06-11 20:38:58 +02:00
myii 91b666c75f Improve limitations related to git.latest in salt.formulas (#239) 
* Ensure options for formulas `git.latest` are also based on defaults

* Prevent erroneous remote tracking branch modification by `salt.formulas` #238

* Allow multiple envs to use the same gitdir for `salt.formulas`

* Ensure `gitdir` original branch is checked out after formulas `git.latest`

* Fix erroneous comment re: merging in `salt` pillar
 2018-06-10 11:18:20 +02:00