-
-
Notifications
You must be signed in to change notification settings - Fork 406
FTY remerge from master as of 20251125 #3200
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
Merged
jimklimov
merged 898 commits into
networkupstools:FTY
from
jimklimov:FTY-remerge-20251125
Nov 30, 2025
Merged
FTY remerge from master as of 20251125 #3200
jimklimov
merged 898 commits into
networkupstools:FTY
from
jimklimov:FTY-remerge-20251125
Nov 30, 2025
+12,371
−5,547
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…me now expected by scripts/python/module/Makefile.am [networkupstools#3130] Signed-off-by: Jim Klimov <[email protected]>
…kupstools#3130] Signed-off-by: Jim Klimov <[email protected]>
Older releases are deprecated and to be removed in November: * https://circleci.com/changelog/deprecation-of-eol-xcode-versions/ * https://circleci.com/changelog/images/#filtered Signed-off-by: Jim Klimov <[email protected]>
Signed-off-by: Jim Klimov <[email protected]>
…et specifically for this script Signed-off-by: Jim Klimov <[email protected]>
…client runs [networkupstools#3130] Signed-off-by: Jim Klimov <[email protected]>
…ided one) as explicit interpreter [networkupstools#3130] CircleCI does see the correct shebang and the script as executable, but apparently tries to call it as a shell script and fails. Maybe /Users/distiller/.pyenv/shims/python3.13 is broken though?.. Or we hit NixOS/nixpkgs#65351 ? Signed-off-by: Jim Klimov <[email protected]>
…tworkupstools#3130] Signed-off-by: Jim Klimov <[email protected]>
…s fallback interpreter [networkupstools#3130] Signed-off-by: Jim Klimov <[email protected]>
…#1209, networkupstools#1316, networkupstools#3144] Signed-off-by: Jim Klimov <[email protected]>
Signed-off-by: Jim Klimov <[email protected]>
Follow https://openbuildservice.org/2021/05/31/scm-integration/ instructions Signed-off-by: Jim Klimov <[email protected]>
CI: upstream OBS recipes from FTY branch
Some fixes after recent PR merges
…for now, and expand workflows for PRs, master iterations and tag releases [networkupstools#1209] Signed-off-by: Jim Klimov <[email protected]>
…d, fall back to the other value we had in mind [networkupstools#3136] In libusb1.c also fix printout of rdlen variables from %d to %PRIi32 Signed-off-by: Jim Klimov <[email protected]>
…dog instead of long quietness when shutting down [networkupstools#3003] Signed-off-by: Jim Klimov <[email protected]>
Signed-off-by: Atanas Vladimirov <[email protected]>
…fferent features are supported Signed-off-by: Jim Klimov <[email protected]>
…E_EXTEND_TIMEOUT` option and relevant variables [networkupstools#3003] Signed-off-by: Jim Klimov <[email protected]>
…protect from systemd or similar framework killing us by timeout [networkupstools#3033] Signed-off-by: Jim Klimov <[email protected]>
…MD_DAEMON_TIMEOUT_STOP_UPSMON substitution [networkupstools#3003] Signed-off-by: Jim Klimov <[email protected]>
…ealpower [networkupstools#3154] Signed-off-by: Jim Klimov <[email protected]>
…ext_device" now that we have a loop and "continue" to try another rdlen [networkupstools#3136] Signed-off-by: Jim Klimov <[email protected]>
Signed-off-by: Jim Klimov <[email protected]>
docs/man/nutdrv_qx.txt: Fix the formatting of VOLTRONIC-AXPERT UNITS
Add SNMP info for ups.realpower for Cyberpower UPS
Signed-off-by: Jim Klimov <[email protected]>
Signed-off-by: Jim Klimov <[email protected]>
…es [networkupstools#3196] Signed-off-by: Jim Klimov <[email protected]>
…e-quotes [networkupstools#3196] Signed-off-by: Jim Klimov <[email protected]>
… script syntax with backticks and double-quotes; convert to use TOUPPER/TOLOWER detected methods [networkupstools#3196] Signed-off-by: Jim Klimov <[email protected]>
…d double-quotes; single-quote Make variable expansions into shell [networkupstools#3196] Signed-off-by: Jim Klimov <[email protected]>
…her "snmp-ups-dmf" or "snmp-ups-old" depending on binary build type [networkupstools#3101] Signed-off-by: Jim Klimov <[email protected]>
Signed-off-by: Jim Klimov <[email protected]>
Signed-off-by: Jim Klimov <[email protected]>
|
✅ Build nut 2.8.4.3805-FTY completed (commit 200a043721 by @jimklimov) |
…snmp-ups{,-old,-dmf}
Signed-off-by: Jim Klimov <[email protected]>
Signed-off-by: Jim Klimov <[email protected]>
…ster Signed-off-by: Jim Klimov <[email protected]>
…of 2025-11-25 Signed-off-by: Jim Klimov <[email protected]>
Signed-off-by: Jim Klimov <[email protected]>
Signed-off-by: Jim Klimov <[email protected]>
Member
Author
|
Now the remaining difference between FTY and master branches seems to be all about the DMF feature (and maybe a few miniscule differences like #2476). |
|
❌ Build nut 2.8.4.3806-FTY failed (commit 3f365ba0a5 by @jimklimov) |
Signed-off-by: Jim Klimov <[email protected]>
4c091e5 to
9ef9f92
Compare
|
✅ Build nut 2.8.4.3808-FTY completed (commit 9627ea6402 by @jimklimov) |
Signed-off-by: Jim Klimov <[email protected]>
…rades or non-disruptive tests" from "Prerequisites for building NUT on different OSes" as the two chapters are closely coupled Signed-off-by: Jim Klimov <[email protected]>
Signed-off-by: Jim Klimov <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Catch up with development in upstream NUT v2.8.5 (to be) cycle.