Skip to content

Comments

[pull] master from networkupstools:master#389

Merged
pull[bot] merged 11 commits intopthis:masterfrom
networkupstools:master
Feb 14, 2026
Merged

[pull] master from networkupstools:master#389
pull[bot] merged 11 commits intopthis:masterfrom
networkupstools:master

Conversation

@pull
Copy link

@pull pull bot commented Feb 14, 2026 •
edited
Loading

See Commits and Changes for more details.

Created by pull[bot] (v2.0.0-alpha.4)

Can you help keep this open source service alive? 💖 Please sponsor : )

jimklimov and others added 11 commits February 12, 2026 20:35
@jimklimov
docs/maintainer-guide.txt: move VERSION_FORCED* file preparation (inv…
aa12c17 
…olves git tagging) to after changing committed files

Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
@jimklimov
docs/maintainer-guide.txt: add OBS reference recipes to watch for ver…
45d4d3b 
…sion bump when releasing

Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
@jimklimov
scripts/Windows/build-mingw-nut.sh: add license header
6ee0afd 
Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
@jimklimov
docs/maintainer-guide.txt: GHA file for PyNUTClient was renamed
6ecf771 
Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
@jimklimov
Revert ".obs/workflows.yml: separate project builds with what looks l…
627cecb 
…ike RC tags to use a separate OBS template (tweaked to change the dash into tilde for packaging versions) [#1209]"

This reverts commit cced83a:
the currently deployed OBS service does not filter by "tags"... sadly.

Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
@jimklimov
conf/upsstats.html.sample.in: drop duplicate @refresh@ directive [#3316]
2cd8817 
Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
@jimklimov
clients/upsstats.c, docs/man/upsstats.html.txt: extend @STATUS@ to in…
eca41b7 
…ject any separators, not only <br/> [#3316]

Keep <br/> as legacy default, to work with older upsstats*.html templates.

Closes: #2525

Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
@jimklimov
clients/upsstats.c: display_tree(): drop spurious <br> at end of tabl…
f022e6d 
…e data cell [#3316]

Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
@jimklimov @dtsecon
common/common.c, include/common.h, drivers/adelsystem_cbi.c, drivers/…
073ce37 
…generic_modbus.c: generalize elapsed_since_timeval() [#1938]

Closes: #1938

Co-authored-by: Dimitris Economou <dimitris.s.economou@gmail.com>
Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
@jimklimov
Merge pull request #3321 from jimklimov/low-hanging-fruits
1ae96a7 
`common.{c,h}`: generalize `elapsed_since_timeval()` originally from modbus drivers
@jimklimov
Merge pull request #3320 from jimklimov/prepare-release-2.8.5-picks
b0b3898 
Pick some changes from "prepare release 2.8.5" branch and PR #3318
@pull pull bot locked and limited conversation to collaborators Feb 14, 2026
@pull pull bot added the ⤵️ pull label Feb 14, 2026
@pull pull bot merged commit b0b3898 into pthis:master Feb 14, 2026
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Reviewers

No reviews

Assignees

No one assigned

Labels

⤵️ pull

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

1 participant

@jimklimov