Merge lp:~andreserl/maas/packaging.trusty into lp:~maas-maintainers/maas/packaging.trusty

Proposed by Andres Rodriguez
Status: Rejected
Rejected by: Julian Edwards
Proposed branch: lp:~andreserl/maas/packaging.trusty
Merge into: lp:~maas-maintainers/maas/packaging.trusty
Diff against target: 23 lines (+8/-2)
1 file modified
debian/changelog (+8/-2)
To merge this branch: bzr merge lp:~andreserl/maas/packaging.trusty
Reviewer Review Type Date Requested Status
Julian Edwards (community) Disapprove
Review via email: mp+231736@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Julian Edwards (julian-edwards) wrote :

Do we want to concentrate the packaging branch on Ubuntu, or PPAs?

review: Approve
Revision history for this message
Julian Edwards (julian-edwards) wrote :

There's no lander for 1.6 packaging, you'll need to push this manually until we get one going.

Revision history for this message
Julian Edwards (julian-edwards) wrote :

I've merged something manually.

Revision history for this message
Julian Edwards (julian-edwards) :
review: Disapprove

Unmerged revisions

295. By Andres Rodriguez

Open 1.6.1 ubuntu2

294. By Andres Rodriguez

Release 1.6.1 for Utopic

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'debian/changelog'
--- debian/changelog 2014-08-21 13:49:08 +0000
+++ debian/changelog 2014-08-21 14:00:08 +0000
@@ -1,4 +1,10 @@
1maas (1.6.1+bzr2550-0ubuntu1~ppa1) trusty; urgency=medium1maas (1.6.1+bzr2550-0ubuntu2) UNRELEASED; urgency=medium
2
3 * UNRELEASED
4
5 -- Andres <roaksoax@unleashed> Thu, 21 Aug 2014 09:56:31 -0400
6
7maas (1.6.1+bzr2550-0ubuntu1) utopic; urgency=medium
28
3 * New upstream bugfix release:9 * New upstream bugfix release:
4 - Auto-link node MACs to Networks (LP: #1341619)10 - Auto-link node MACs to Networks (LP: #1341619)
@@ -15,7 +21,7 @@
1521
16 -- Julian Edwards <julian.edwards@canonical.com> Thu, 21 Aug 2014 18:38:27 +100022 -- Julian Edwards <julian.edwards@canonical.com> Thu, 21 Aug 2014 18:38:27 +1000
1723
18maas (1.6.0+bzr2545-0ubuntu1~ppa1) trusty; urgency=medium24maas (1.6.0+bzr2545-0ubuntu1) trusty; urgency=medium
1925
20 * New upstream release 1.6.026 * New upstream release 1.6.0
2127

Subscribers

People subscribed via source and target branches