Created by Jelmer Vernooij and last modified
Get this branch:
bzr branch lp:~jelmer/maas/force-merge-mode
Only Jelmer Vernooij can upload to this branch. If you are Jelmer Vernooij please log in for upload directions.

Branch merges

Related bugs

Related blueprints

Branch information

Jelmer Vernooij

Recent revisions

88. By Jelmer Vernooij

Force merge mode.

87. By Scott Moser

[r=andreserl][bug=][author=smoser] Fix daily package build.

86. By Scott Moser

[r=andreserl][bug=][author=smoser] update packaging to pass --ip to maas configure_master_dhcp

This makes a change to use debconf to get the (now required) ip address of the dhcp server, via the debconf name 'maas-dhcp/maas-dhcp-addr'. If left blank, it will
pick the ip address of the named interface from the provided maas-dhcp-interface.

There are some other changes lumped in here also.
 * fix a lintian warning in maas-dhcp.postrm
 * move tests/maas-integration.py to a patch in debian/patches/
   Debian packages are not supposed to modify the trunk directly, and
   'debuild -S' complained about changes to that file that were not accounted for.

85. By Scott Moser

[r=andreserl][bug=][author=smoser] On install and removal of maas-dhcp invoke apparmor update

84. By Julian Edwards

[r=julian-edwards][bug=][author=julian-edwards] The config_master_dhcp option ``--dhcp-interfaces`` is no longer valid, it needs to be --interface instead.

83. By Andres Rodriguez

debian/maas.postinst: Always restart apache2

82. By Diogo Matsubara

[r=jtv][bug=][author=matsubara] This branch adds the XS-Testsuite header to the package and some initial tests to be run by autopkgtest

81. By Scott Moser

[r=julian-edwards][bug=1049177][author=smoser] Add a maas specific profile for isc-dhcp-server package.

80. By Andres Rodriguez


79. By Andres Rodriguez

debian/extras/99-maas-sudoers: Add missing rule for
maas-provision. (LP: #1046397)

Branch metadata

Branch format:
Branch format 7
Repository format:
Bazaar repository format 2a (needs bzr 1.16 or later)
Stacked on:
This branch contains Public information 
Everyone can see this information.