lp:~newell-jensen/maas/1.5-bug-1373580

Branch merges

Propose for merging

Merged into lp:maas/1.5 at revision 2298

Newell Jensen (community): Approve on 2014-09-30

Diff: 13 lines (+2/-1)

1 file modified

src/provisioningserver/drivers/hardware/mscm.py (+2/-1)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #1373580: [SRU] Glen m700 cartridge list as ARM64/generic after enlist

High

Fix Released

Link a bug report

Related blueprints

2297. By Newell Jensen on 2014-09-29

Backport trunk r3080: Setting default cartridge to amd64/generic and adding ProLiant m700 Server Cartridge to the cartridge mapping.

2296. By Jeroen T. Vermeulen on 2014-08-08

[r=jtv][bug=1354511][author=jtv] Backport trunk r2668: When timing out nodes that haven't finished commissioning, compare the last-update timestamp to the database clock (from which it was also generated), not to the Python-side clock. Timezone skew between the two could cause nodes to time out immediately, or hours late.

2295. By Newell Jensen on 2014-07-31

[r=newell-jensen][bug=1350103][author=newell-jensen] Backport trunk r2634: Enablement for armhf/keystone architecture.

2294. By Julian Edwards on 2014-07-30

Add changelog for 1.5.4

2293. By Gavin Panella on 2014-07-30

[r=allenap][bug=1350235][author=allenap] Backport r2616 and r2621 from trunk:

- Make guess_server_address() work with aliased interface names.

- Test find_default_interface() with aliased interfaces. Rename incorrectly named tests for tagged interfaces, then add actual tests for aliased interfaces.

2292. By Newell Jensen on 2014-07-24

[r=newell-jensen][bug=1338851][author=newell-jensen] arm64 enablement backported to MaaS 1.5

2291. By Blake Rouse on 2014-07-18

[r=rvb][bug=1337437][author=blake-rouse] Add 14.10 Utopic Unicorn to available distro series. Remove quantal and raring as support period has ended.

2290. By Julian Edwards on 2014-07-15

[r=julian-edwards][bug=1190986][author=julian-edwards] Backport trunk r2554: Fix nonce generation to use uuid.uuid4() rather than random [0-9]{8} string; makes nonce collisions WAY less likely.

2289. By Adam Collard on 2014-06-19

[r=gmb,adam-collard][bug=][author=adam-collard] Backport of lp:~adam-collard/maas/nodegroup-details-docs to 1.5

2288. By Tom Haddon on 2014-06-11

[r=rvb][bug=][author=mthaddon] Backport revision 2415: Make the navigation elements visible.