Skip to:

  1. Skip to Jira Navigation
  2. Skip to Side Navigation
  3. Skip to Main Content

Changes in NMS-17726 are not properly merged in foundation-2023, foundation-2024 and horizon 33.x

Description

Changes in are not properly merged in foundation-2023, foundation-2024 and horizon 33.x.
File Name:
opennms-container/minion/container-fs/entrypoint.sh

Acceptance / Success Criteria

None

Activity

Show:

Morteza 3 days ago

Yes, it should be easier to forward merge the change (if possible).

Ronny Trommer 3 days ago

Just noticed there are several people making PR’s about the same topic against various branches:

Wouldn’t it not just easier to forward merge manually and fix the conflicts? The change is just one line?

Morteza March 11, 2025 at 4:22 PM

Just an FYI, we discovered that the changes delivered in is not merged forward properly. This issue is opened to addressed this.

Details

Assignee

Reporter

HB Grooming Date

HB Backlog Status

Sprint

Fix versions

Priority

PagerDuty

Created March 11, 2025 at 4:14 PM
Updated 3 days ago