Merge lp://qastaging/~paulgear/charms/precise/nrpe-external-master/fix-duplicate-rsync-entries into lp://qastaging/charms/nrpe-external-master

Proposed by Paul Gear
Status: Merged
Merged at revision: 39
Proposed branch: lp://qastaging/~paulgear/charms/precise/nrpe-external-master/fix-duplicate-rsync-entries
Merge into: lp://qastaging/charms/nrpe-external-master
Diff against target: 24 lines (+2/-2)
2 files modified
hooks/install (+1/-1)
tests/99-autogen (+1/-1)
To merge this branch: bzr merge lp://qastaging/~paulgear/charms/precise/nrpe-external-master/fix-duplicate-rsync-entries
Reviewer Review Type Date Requested Status
Adam Israel (community) Approve
Review Queue (community) Needs Fixing
Brad Marshall (community) Approve
charmers Pending
Review via email: mp+250248@code.qastaging.launchpad.net
To post a comment you must log in.
Revision history for this message
Brad Marshall (brad-marshall) wrote :

Looks good to me.

review: Approve
Revision history for this message
Review Queue (review-queue) wrote :

This items has failed automated testing! Results available here http://reports.vapour.ws/charm-tests/charm-bundle-test-11054-results

review: Needs Fixing (automated testing)
40. By Paul Gear

Increase timeout to 30 minutes to allow Azure test to complete

Revision history for this message
Adam Israel (aisrael) wrote :

Hi Paul,

This looks good to me, too. +1

review: Approve

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: