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.

Sign up for GitHub

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

Jump to bottom

Allow to override git_pillar_base per-remote (Port #51640 to master) #57288

Merged
merged 5 commits into from
Sep 29, 2020
Merged

Allow to override git_pillar_base per-remote (Port #51640 to master) #57288

merged 5 commits into from
Sep 29, 2020

Conversation

sathieu
Copy link
Contributor

@sathieu sathieu commented May 14, 2020

What does this PR do?

Allow to override git_pillar_base per-remote.

Note: port of #51640.

New Behavior

Example:

git_pillar_base: develop

ext_pillar:
  - git:
    - __env__ https://gitserver/git-pillar.git
    - __env__ https://gitserver/git-pillar2.git:
      - base: master

Merge requirements satisfied?

[NOTICE] Bug fixes or features added to Salt require tests.

Commits signed with GPG?

No

@sathieu sathieu requested a review from a team as a code owner May 14, 2020 20:09
@ghost ghost requested review from cmcmarrow and removed request for a team May 14, 2020 20:09
This was referenced May 14, 2020
Merged
Closed
@dwoz dwoz added the Needs-Testcase PR needs test cases written, or the issue is about a bug/feature that needs test cases label May 18, 2020
@sathieu sathieu force-pushed the git_pillar_base_override_master branch 2 times, most recently from e721d47 to e7ae1c4 Compare May 28, 2020 15:26
@sathieu
Copy link
Contributor Author

sathieu commented May 28, 2020

@cmcmarrow @dwoz Please review again.

@cmcmarrow cmcmarrow added Merge Ready and removed Needs-Testcase PR needs test cases written, or the issue is about a bug/feature that needs test cases labels May 28, 2020
cmcmarrow
cmcmarrow previously approved these changes May 28, 2020
View reviewed changes
@sathieu sathieu force-pushed the git_pillar_base_override_master branch 2 times, most recently from d2be7a8 to ea04771 Compare August 25, 2020 14:41
@sathieu
Copy link
Contributor Author

sathieu commented Aug 26, 2020

@cmcmarrow You've marked this PR Merge Ready. I've now rebased and fixed pre-commit and Pylint. Hope you merge it now ...

@sathieu sathieu mentioned this pull request Sep 3, 2020
Merged
@sathieu sathieu force-pushed the git_pillar_base_override_master branch from ea04771 to 8afc298 Compare September 3, 2020 15:30
@sathieu sathieu requested a review from cmcmarrow September 3, 2020 15:31
@sathieu
Copy link
Contributor Author

sathieu commented Sep 17, 2020

@sagetherage @cmcmarrow Any chance to get this reviewed and merged soon? It was marked merge-ready few months ago...

Thanks

@sagetherage
Copy link
Contributor

looking into this now

@sagetherage sagetherage added the Magnesium Mg release after Na prior to Al label Sep 17, 2020
@sathieu
Copy link
Contributor Author

sathieu commented Sep 29, 2020

@cmcmarrow @sagetherage Hello. Sorry to insist, but can this be merged in magnesium ?

This MR exists since Feb 2019.

@sathieu sathieu force-pushed the git_pillar_base_override_master branch from 8afc298 to 5c0cde2 Compare September 29, 2020 09:21
@sathieu sathieu force-pushed the git_pillar_base_override_master branch from 0c13045 to c671f29 Compare September 29, 2020 13:49
@sagetherage
Copy link
Contributor

yes, labeled and I updated it with master now

@dwoz dwoz merged commit 545f764 into saltstack:master Sep 29, 2020
@sathieu sathieu deleted the git_pillar_base_override_master branch September 30, 2020 04:51
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@dwoz dwoz dwoz approved these changes

@cmcmarrow cmcmarrow Awaiting requested review from cmcmarrow

Assignees
No one assigned
Labels
has-failing-test Magnesium Mg release after Na prior to Al master-port
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@sathieu @sagetherage @dwoz @cmcmarrow