forked from networkupstools/nut
-
Notifications
You must be signed in to change notification settings - Fork 4
Fty remerge 20220225 #169
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
Open
jimklimov
wants to merge
825
commits into
42ity:FTY
Choose a base branch
from
jimklimov:FTY-remerge-20220225
base: FTY
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Fty remerge 20220225 #169
+14,248
−2,557
Conversation
This file contains 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
fc5bb14
to
5419eee
Compare
@aquette : Hi, can you take a look what upsets the IPM Jenkins build? Is that something that blocks a PR merge (would the resulting FTY branch be bad material for packaging)? |
…DAISY_1 and SU_TYPE_DAISY_2
…ltronic Power GalleonX9-RT LCD-1-3K (USB) Closes: networkupstools#1251
Update NUT HCL before 2.8.0 release
drivers/libusb{0,1}.c: report why we could not open any HID devices
USB-capable drivers: introduce warn_if_bad_usb_port_filename()
…o" for NUT v2.8.0 Development since 2.7.4 release included changes to code structure, fought warnings, and might impact ABI/API by the changes to arguments (specific integer types and size_t vs. architecture-dependent choice).
…o" for NUT v2.8.0 Development since 2.7.4 release included changes to code structure, fought warnings, and might impact ABI/API by the changes to arguments (specific integer types and size_t vs. architecture-dependent choice).
Git somehow pushed one history as master branch and another, with same commit contents and a tag to one of them, as the official NUT v2.8.0 release. This merge commit brings the publicly tagged commit history "back" into the mainline. Probably a fallout from GitHub "Rebase and Merge" action.
…th NUT v2.8.0 release) into FTY-remerge-20220225
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.
ePDU walk diff compared to master branch: