~woodrow-shen/ubuntu-cdimage/oem-cdimage

Viewing all changes in revision 1675.

  • Committer: Woodrow Shen
  • Date: 2017-07-13 09:08:36 UTC
  • mfrom: (1665.2.5 cdimage)
  • Revision ID: woodrow.shen@canonical.com-20170713090836-s5nj8b1img83i1w2
[merge] Merge lp:ubuntu-cdimage
--
(r1670)Steve Langasek 2017-06-22 xenial: PROPOSED=1
(r1669)Steve Langasek 2017-06-15 Add armhf+cm3 to the default list of ubuntu-core images
(r1668)Steve Langasek 2017-05-24 [merge] Merge lp:~tsimonq2/ubuntu-cdimage/lubuntu-next-germinate, with adjustments
           Simon Quigley 2017-05-24 Add lubuntu-next in Germinate
(r1667)Steve Langasek 2017-05-16 [merge] Merge lp:~vorlon/ubuntu-cdimage/match-series-for-current-triggers with test fix suggested by Adam
           Steve Langasek 2017-05-16 Use match_series() on current-triggers, so config can be condensed.
(r1666)Steve Langasek 2017-05-16 [merge] Merge lp:~vorlon/ubuntu-cdimage/public-info-out-of-private-production
           Steve Langasek 2017-05-16 Pull livefs launchpad mapping in from 'production' branch.

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: