Skip to content

Merge upstream changes for incommon-v9 #3

Merged
merged 63 commits into from Feb 26, 2019
Merged

Merge upstream changes for incommon-v9 #3

merged 63 commits into from Feb 26, 2019

Conversation

iay
Copy link
Contributor

@iay iay commented Feb 25, 2019

See inc-meta#93.

iay and others added 30 commits August 29, 2017 10:56
This was needed circa 2013 to guard against a curl-based issue in
the Shibboleth SP. This can no longer affect us because we no
longer use the PKIX trust model.
These IDs are currently defaulted by the validators, but that behaviour will go away in a future MDA release.
Iterate on the generation of mdui:UIInfo for identitify providers which do not have mdui:UIInfo already. Reduces the number of warnings we get from the eduGAIN validator.
See ukf/ukf-meta#150.
…ort aggregates

See ukf/ukf-meta#21.
See ukf/ukf-meta#150.
Now that this is being done everywhere, we can just do it once, and simplify the way it's done.
See ukf/ukf-meta#150.
Alex Stuart and others added 26 commits March 8, 2018 15:38
Check is flagged as warning.

See ukf/ukf-meta#157
See ukf/ukf-meta#159.
See ukf/ukf-meta#159.
See ukf/ukf-meta#159.
See ukf/ukf-meta#159.
See ukf/ukf-meta#159.
See ukf/ukf-meta#159.
Relaxes the definition of a clash between identity provider display names to ignore md:OrganizationDisplayName for any IdP that has mdui:DisplayName.
See ukf/ukf-meta#150.
Resolves ukf/ukf-meta#154.
@iay
Copy link
Contributor Author

iay commented Feb 25, 2019

@dshafer @nroy It's worth passing your eyes over this one in a bit more detail to see what a larger (but still non-conflicting) PR looks like. The tabs at the top allow you to look at things from the perspective of the individual commits, or alternatively by the aggregate changes to files. The latter view might be easier to skim for the current purposes, because of course you can entirely skip over any files that are UKf-specific.

Copy link
Contributor Author

@iay iay left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks like a clean set of changes. A trial merge behaves as expected (one CZ entity re-included).

@iay iay merged commit e8c45c3 into master Feb 26, 2019
@iay iay deleted the inc-meta-93-upstream branch February 26, 2019 16:54
Sign in to join this conversation on GitHub.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

1 participant