The Wayback Machine - https://web.archive.org/web/20201111215426/https://github.com/saltstack/salt/issues/58313
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

[BUG] #52359 was fixed for develop, but not merged to master #58313

Open
wegenerbenjamin opened this issue Aug 28, 2020 · 4 comments
Open

[BUG] #52359 was fixed for develop, but not merged to master #58313

wegenerbenjamin opened this issue Aug 28, 2020 · 4 comments

Comments

@wegenerbenjamin
Copy link

@wegenerbenjamin wegenerbenjamin commented Aug 28, 2020

The issue #52359 was fixed and merged into develop, but no further steps have been taken to bring the changes to the master branch; the bug is still present in the latest version.

https://docs.saltstack.com/en/latest/topics/development/git/index.html states develop as the main development branch, but https://docs.saltstack.com/en/latest/topics/development/contributing.html#which-salt-branch mentions master as the sole development branch. I was told in a different issue that master is the development branch.

I couldn't find any information on how open fixes/changes from develop will be moved into master.

@sagetherage
Copy link
Contributor

@sagetherage sagetherage commented Sep 23, 2020

Yes, we are aware and need to clean up for sure, thank you for the issue!

@sagetherage
Copy link
Contributor

@sagetherage sagetherage commented Oct 26, 2020

@wegenerbenjamin for this piece: " The issue #52359 was fixed and merged into develop" we have the original PR#52630 on the project board to be ported to master here https://github.com/saltstack/salt/projects/5?card_filter_query=52360 and we will eventually get to this and if you would like to help us, please consider opening a PR port to master branch, thank you!

@sagetherage
Copy link
Contributor

@sagetherage sagetherage commented Oct 26, 2020

@wegenerbenjamin for this: "I couldn't find any information on how open fixes/changes from develop will be moved into master." you are correct! The Core team did announce back when this was done, but we do not have documentation on this today, but we will take that up in the next major release to at least publish a blog post or perhaps we will put something sooner on the https://github.com/saltstack/community/wiki

@ScriptAutomate
Copy link
Contributor

@ScriptAutomate ScriptAutomate commented Oct 26, 2020

Places where develop branch is mentioned, and needs to be revisited:

# grep with line numbers
grep -nr '``develop``'
doc/ref/configuration/master.rst:3039:configuration will map the ``develop`` branch to the ``dev`` saltenv for all
doc/topics/development/git/index.rst:19:All new SaltStack code should be submitted against either the ``develop`` branch
doc/topics/releases/2016.3.3.rst:27:running Salt with the TCP transport. This is fixed on the ``develop`` branch of
doc/topics/tutorials/gitfs.rst:383:1. The first and fourth gitfs remotes will use the ``develop`` branch/tag as the
doc/topics/tutorials/gitfs.rst:398:   at ``develop``), and ``foo`` (pointed at ``foo``).
doc/topics/tutorials/gitfs.rst:467:   sourced from the ``develop`` branch.
.github/CONTRIBUTING.md:27:   as ``2016.3``, ``2016.11``, or even ``develop``, may already contain
@sagetherage sagetherage self-assigned this Oct 26, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
Aluminium
  
To do
Linked pull requests

Successfully merging a pull request may close this issue.

None yet
5 participants
You can’t perform that action at this time.