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

Update pillar.example for single-dir, multi-branch salt_formulas #239 #373

Merged
merged 1 commit into from
Jun 11, 2018

Conversation

myii
Copy link
Member

@myii myii commented Jun 11, 2018

  • Also minor unrelated updates/fixes

@myii
Copy link
Member Author

myii commented Jun 11, 2018

@aboe76 So here is the pillar.example in order to complete #239. I've kept the changes as simple and minimal as possible.

Test results (modified output to username):

$ git remote -v; git branch -vv
origin  git@github.com:username/salt-formula.git (fetch)
origin  git@github.com:username/salt-formula.git (push)
upstream        git@github.com:saltstack-formulas/salt-formula.git (fetch)
upstream        git@github.com:saltstack-formulas/salt-formula.git (push)
* master   91b666c [origin/master] Improve limitations related to `git.latest` in `salt.formulas` (#239)
  staging  91b666c [origin/staging] Improve limitations related to `git.latest` in `salt.formulas` (#239)
  upstream 2761d90 [upstream/master] minion: master_alive_interval: remove duplicate (#369)

@aboe76 aboe76 merged commit 784e2bc into saltstack-formulas:master Jun 11, 2018
@aboe76
Copy link
Member

aboe76 commented Jun 11, 2018

@myii thanks for this

@myii myii deleted the PR_git-latest-pillar branch June 11, 2018 18:58
@myii
Copy link
Member Author

myii commented Jun 11, 2018

@aboe76 You're welcome.

ixs pushed a commit to bawuenet/salt-formula that referenced this pull request Jul 22, 2018
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