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

[2019.2] Merge forward from 2018.3 to 2019.2 #51277

Merged
merged 31 commits into from Jan 23, 2019

Conversation

@garethgreenaway
Copy link
Member

commented Jan 22, 2019

Merge branch '2018.3' into merge-2019.2

Conflicts:

  • None
mirceaulinic and others added 30 commits Dec 13, 2018
Since I added these modules in 2017.7.0, Capirca has been released on PyPI,
now available to be installed as a regular Python library.

Besides that, in the past there were various issues due to the way the modules
are interacting with the underlying library, solved by adding a hardcoded list
for the policy term fields. This has caused some issues in the past, and had
to be patches, e.g., db255d3 or
1e74141.
While the changes referenced above are not particularly big, it's tedious to
always keep an eye on Capirca and be aware of what's newly added or changed.
Besides, this may have caused issues for users in the past when using other
Capirca versions.
Mike Place
Mention that jinja includes need to use the full path and cannot use relative paths.
 [2017.7] Update to salt-bootstrap v2019.01.08
Document {% include %}
Improve the Capirca and related modules for ACL config generation
b3e2f38 enhanced nodegroup matching to allow sequences. However, the
list of regex special characters appears to have been improperly
formatted.
Conflicts:
  - salt/modules/capirca_acl.py
…s, eg. windows systems.
[2018.3] Merge forward from 2017.7 to 2018.3
Backport #51105 to 2018.3
…_fstab_opts

[2018.3] Handle spaces in fstab opts, similar fix to #39593
Honor roster system for ssh orchestrations
Erik Johnson
Fix possible oversight in nodegroup modifications
@garethgreenaway garethgreenaway requested a review from saltstack/team-core as a code owner Jan 22, 2019
@Ch3LL
Ch3LL approved these changes Jan 22, 2019
@s0undt3ch s0undt3ch merged commit 8596ee4 into saltstack:2019.2 Jan 23, 2019
10 checks passed
10 checks passed
WIP Ready for review
Details
continuous-integration/jenkins/pr-merge This commit looks good
Details
jenkins/pr/docs The docs job has passed
Details
jenkins/pr/lint Python lint test has passed
Details
jenkins/pr/py2-centos-7 The py2-centos-7 job has passed
Details
jenkins/pr/py2-ubuntu-1604 The py2-ubuntu-1604 job has passed
Details
jenkins/pr/py2-windows-2016 The py2-windows-2016 job has passed
Details
jenkins/pr/py3-centos-7 The py3-centos-7 job has passed
Details
jenkins/pr/py3-ubuntu-1604 The py3-ubuntu-1604 job has passed
Details
jenkins/pr/py3-windows-2016 The py3-windows-2016 job has passed
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
8 participants
You can’t perform that action at this time.