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

[IPMPROG-331] Master -> FTY remerge 20210925, simple half #135

Merged
merged 419 commits into from
Sep 28, 2021

Conversation

jimklimov
Copy link
Member

@jimklimov jimklimov commented Sep 25, 2021

This PR imports changes from upstream NUT into 42ITy fork up to commit 8809800, except one more complicated change.

Note: this PR lacks master-branch commit ab6041c from upstream NUT PR 1078 networkupstools#1078 (date conversions), which changes some API/types that our DMF effort also changed, so needs some extra analysis to digest into 42ITy NUT and will be posted separately.

jimklimov and others added 30 commits August 26, 2021 16:01
…passed from "${CONFIG_OPTS[@]}" array into DISTCHECK_CONFIGURE_FLAGS string (envvar)
…passed from "${CONFIG_OPTS[@]}" array into DISTCHECK_CONFIGURE_FLAGS string (envvar) - refactor
…LY_FLAGS to propagate -Wno-unknown-warning(-opton) before any pkgconfig
…ne+stageNameClone"

This reverts commit 2d477fa :
"synchronized" is not supported for Jenkins Groovy CPS
Note: lacks master-branch commit ab6041c
from upstream NUT PR networkupstools#1078 (date conversions) which changes some API/types
that DMF effort also changed, so needs some extra analysis to digest into
42ITy NUT.
* Index *.py.in + scripts/python/app/NUT-Monitor.in
* Do not consider them templates to ignore
* Also turn off the FIXME alerts, NUT has a lot of those so far
…d as part of doc, then attached into position
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants