Skip to content

Updates canonical with security changes

DJ Mountney requested to merge update-canonical-with-security-changes into master

What does this MR do?

Updates canonical with security changes. These are the commands I ran to bring in the canonical changes:

10012  git checkout -b master --track origin/master
10013  git fetch security
10014  git checkout -b update-canonical-with-security-changes
10015  git merge security/master

Related issues

Checklist

See Definition of done.

For anything in this list which will not be completed, please provide a reason in the MR discussion.

Required

  • Merge Request Title and Description are up to date, accurate, and descriptive
  • MR targeting the appropriate branch
  • MR has a green pipeline on GitLab.com
  • When ready for review, MR is labeled "~workflow::ready for review" per the Distribution MR workflow

Expected (please provide an explanation if not completing)

  • Test plan indicating conditions for success has been posted and passes
  • Documentation created/updated
  • Tests added
  • Integration tests added to GitLab QA
  • Equivalent MR/issue for omnibus-gitlab opened
  • Validate potential values for new configuration settings. Formats such as integer 10, duration 10s, URI scheme://user:passwd@host:port may require quotation or other special handling when rendered in a template and written to a configuration file.

Merge request reports