Merge lp:~andreserl/maas/packaging_1.8.1_prep into lp:~maas-maintainers/maas/packaging-1.8
Proposed by
Andres Rodriguez
Status: | Merged |
---|---|
Approved by: | Andres Rodriguez |
Approved revision: | 413 |
Merged at revision: | 413 |
Proposed branch: | lp:~andreserl/maas/packaging_1.8.1_prep |
Merge into: | lp:~maas-maintainers/maas/packaging-1.8 |
Diff against target: |
43 lines (+28/-2) 1 file modified
debian/changelog (+28/-2) |
To merge this branch: | bzr merge lp:~andreserl/maas/packaging_1.8.1_prep |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Andres Rodriguez (community) | Approve | ||
Review via email: mp+265907@code.launchpad.net |
Commit message
Update changelog for 1.8.1 prep.
To post a comment you must log in.
On Sun, Jul 26, 2015 at 01:12:27PM -0000, Andres Rodriguez wrote: bzr4019- 0ubuntu2) UNRELEASED; urgency=medium bzr4027- 0ubuntu1) UNRELEASED; urgency=medium
> +<<<<<<< TREE
> maas (1.8.1+
> +=======
> +maas (1.8.1+
Did you resolve the conflict? launchpad. net/~kiko
--
Christian Robottom Reis | [+1] 612 888 4935 | http://
Canonical VP Hyperscale | [+55 16] 9 9112 6430