Merge ~xypron/ubuntu/+source/rsyslog:merge-request into ubuntu/+source/rsyslog:ubuntu/devel
Proposed by
Heinrich Schuchardt
| Status: | Superseded | ||||
|---|---|---|---|---|---|
| Proposed branch: | ~xypron/ubuntu/+source/rsyslog:merge-request | ||||
| Merge into: | ubuntu/+source/rsyslog:ubuntu/devel | ||||
| Diff against target: |
215 lines (+174/-5) (has conflicts) 5 files modified
debian/changelog (+96/-0) debian/rsyslog.logcheck.ignore.server (+4/-5) debian/salsa-ci.yml (+3/-0) debian/tests/control (+7/-0) debian/tests/logcheck (+64/-0) Conflict in debian/changelog Conflict in debian/tests/control |
||||
| Related bugs: |
|
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| git-ubuntu import | Pending | ||
|
Review via email:
|
|||
Commit message
Merge with Debian unstable (LP: #2028935)
To post a comment you must log in.
Revision history for this message
| Andreas Hasenack (ahasenack) wrote | # |
There was an error fetching revisions from git servers. Please try again in a few minutes. If the problem persists, contact Launchpad support.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The target branch should be debian/sid for merges from debian, then you won't get conflicts