Merge lp://staging/~s-launchpad-paulsd-com/rsyslog/utopic-proposed into lp://staging/ubuntu/utopic-proposed/rsyslog

Proposed by Paul Donohue
Status: Needs review
Proposed branch: lp://staging/~s-launchpad-paulsd-com/rsyslog/utopic-proposed
Merge into: lp://staging/ubuntu/utopic-proposed/rsyslog
Diff against target: 1631 lines (+1432/-29)
13 files modified
.pc/11-fix-infinite-loop-openvz-vms.patch/plugins/imklog/bsd.c (+298/-0)
.pc/11-fix-infinite-loop-openvz-vms.patch/plugins/imklog/imklog.c (+488/-0)
.pc/11-fix-infinite-loop-openvz-vms.patch/plugins/imklog/imklog.h (+70/-0)
.pc/11-fix-infinite-loop-openvz-vms.patch/plugins/imkmsg/imkmsg.c (+295/-0)
.pc/11-fix-infinite-loop-openvz-vms.patch/plugins/imkmsg/imkmsg.h (+64/-0)
debian/changelog (+7/-0)
debian/patches/11-fix-infinite-loop-openvz-vms.patch (+157/-15)
plugins/imklog/bsd.c (+25/-2)
plugins/imklog/imklog.c (+2/-1)
plugins/imklog/imklog.h (+2/-1)
plugins/imkmsg/imkmsg.c (+2/-1)
plugins/imkmsg/imkmsg.h (+2/-1)
plugins/imkmsg/kmsg.c (+20/-8)
To merge this branch: bzr merge lp://staging/~s-launchpad-paulsd-com/rsyslog/utopic-proposed
Reviewer Review Type Date Requested Status
Brian Murray Pending
Review via email: mp+245975@code.staging.launchpad.net

Description of the change

Updated fix for infinite loop on OpenVZ VMs (LP: #1366829)

To post a comment you must log in.

Unmerged revisions

67. By Paul Donohue

Applied updated upstream patch fixing infinite loop on OpenVZ VMs.
(LP: #1366829)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches

to all changes: