Merge lp://qastaging/~bigdata-dev/charms/trusty/apache-flume-syslog/prod-merge into lp://qastaging/charms/trusty/apache-flume-syslog
Proposed by
Cory Johns
| Status: | Needs review |
|---|---|
| Proposed branch: | lp://qastaging/~bigdata-dev/charms/trusty/apache-flume-syslog/prod-merge |
| Merge into: | lp://qastaging/charms/trusty/apache-flume-syslog |
| Diff against target: |
12 lines (+1/-1) 1 file modified
resources.yaml (+1/-1) |
| To merge this branch: | bzr merge lp://qastaging/~bigdata-dev/charms/trusty/apache-flume-syslog/prod-merge |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Kevin W Monroe | Disapprove | ||
| amir sanjar (community) | Approve | ||
| charmers | Pending | ||
|
Review via email:
|
|||
Description of the change
Merged dev branch, properly resolving conflicts due to divergent history.
To post a comment you must log in.
Revision history for this message
| amir sanjar (asanjar) | # |
review:
Approve
Unmerged revisions
- 2. By Cory Johns
-
Merged dev branch
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
This has been merged into lp:charms/trusty/apache-flume-syslog, but not via this MP. The apache-flume-syslog charm was messed up when I requested promulgation (not sure, but it seems i copied the src, axed the .bzr, and pushed to bigdata-charmers). Long story short, the ancestry between -dev and -charmers was broken, but now it's fixed. The changes to require jujubigdata > 4 are now in the correct branches.
I suggest this MP be deleted.