livecd-rootfs

Merge lp://staging/~mwhudson/livecd-rootfs/live-server-no-openssh-server into lp://staging/livecd-rootfs

  1. live-server-no-openssh-server
  2. Merge into trunk
Proposed by Michael Hudson-Doyle
Status: Merged
Merge reported by: Steve Langasek
Merged at revision: not available
Proposed branch: lp://staging/~mwhudson/livecd-rootfs/live-server-no-openssh-server
Merge into: lp://staging/livecd-rootfs
Diff against target: 37 lines (+11/-1) (has conflicts)
2 files modified
debian/changelog (+10/-0)
live-build/auto/config (+1/-1)
Text conflict in debian/changelog
To merge this branch: bzr merge lp://staging/~mwhudson/livecd-rootfs/live-server-no-openssh-server
Reviewer Review Type Date Requested Status
Simon Quigley Needs Resubmitting
Review via email: mp+360430@code.staging.launchpad.net

Commit message

Do not include openssh-server in the base filsystem for the live server installer.

Description of the change

This will conflict with my other change in review, but not in any very interesting way.

To post a comment you must log in.
Revision history for this message
Balint Reczey (rbalint) wrote :

The target Bazaar branch is not active anymore.
Please resubmit the merge proposal against https://code.launchpad.net/~ubuntu-core-dev/livecd-rootfs/+git/livecd-rootfs/+ref/ubuntu/master .

Revision history for this message
Simon Quigley (tsimonq2) wrote :

Updating the status to reflect Balint's comment.

review: Needs Resubmitting

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