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

[2018.3] Merge forward from 2017.7 to 2018.3 #51230

Merged
merged 11 commits into from Jan 18, 2019

Conversation

Projects
None yet
6 participants
@Ch3LL
Copy link
Contributor

commented Jan 17, 2019

Conflicts:

  • salt/modules/capirca_acl.py

mirceaulinic and others added some commits Dec 13, 2018

Improve the Capirca and related modules for ACL config generation
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
Document {% include %}
Mention that jinja includes need to use the full path and cannot use relative paths.
Merge pull request #51111 from s0undt3ch/2017.7
 [2017.7] Update to salt-bootstrap v2019.01.08
Merge pull request #50852 from mirceaulinic/fix-capirca
Improve the Capirca and related modules for ACL config generation
Merge branch '2017.7' into '2018.3'
Conflicts:
  - salt/modules/capirca_acl.py

@garethgreenaway garethgreenaway self-requested a review Jan 18, 2019

@garethgreenaway garethgreenaway merged commit e53e9b1 into saltstack:2018.3 Jan 18, 2019

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

@Ch3LL Ch3LL deleted the Ch3LL:merge-2018.3 branch Jan 18, 2019

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.