~jelmer/maas/force-merge-mode

Viewing all changes in revision 65.

  • Committer: Tarmac
  • Author(s): Andres Rodriguez
  • Date: 2012-08-24 19:20:34 UTC
  • mfrom: (64.1.1 quantal)
  • Revision ID: ed@carob-20120824192034-cevpdds73yrrrf92
[r=andreserl][bug=][author=andreserl] Depends on isc-dhcp-server for maas-dhcp, and syslinux-common.
Drop some conflicts/replaces to upgrade correctly

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: