MAAS

Merge lp:~andreserl/maas/lp1591093_1.9 into lp:maas/1.9

  1. lp1591093_1.9
  2. Merge into 1.9
Proposed by Andres Rodriguez
Status: Merged
Approved by: Andres Rodriguez
Approved revision: no longer in the source branch.
Merged at revision: 4585
Proposed branch: lp:~andreserl/maas/lp1591093_1.9
Merge into: lp:maas/1.9
Diff against target: 55 lines (+13/-2)
2 files modified
docs/changelog.rst (+11/-0)
etc/maas/drivers.yaml (+2/-2)
To merge this branch: bzr merge lp:~andreserl/maas/lp1591093_1.9
Reviewer Review Type Date Requested Status
Andres Rodriguez (community) Approve
Review via email: mp+297092@code.launchpad.net

This proposal supersedes a proposal from 2016-06-10.

Commit message

Use the correct repository URL for hpdsa in drivers.yaml. Drive-by fix for the changelog.

To post a comment you must log in.
Revision history for this message
Andres Rodriguez (andreserl) wrote : Posted in a previous version of this proposal

Self approving as this was approved in: https://code.launchpad.net/~andreserl/maas/fix_hdpsa_repo2/+merge/297086

review: Approve
Revision history for this message
Andres Rodriguez (andreserl) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'docs/changelog.rst'
2--- docs/changelog.rst 2016-06-01 13:15:16 +0000
3+++ docs/changelog.rst 2016-06-10 16:36:35 +0000
4@@ -6,11 +6,18 @@
5 =====
6
7 LP: #1584850 [1.9] DNS record added for non-boot interface IP when no address of that family exists on the boot interface
8+
9 LP: #1583715 [1.9] Ensure that restricted resources also perform meaningful authentication of clients.
10+
11 LP: #1584211 [1.9] Exclude RAM, floppy, and loopback devices from lsblk during commissioning.
12+
13 LP: #1585400 [1.9] Change detect_missing_packages in moonshot power driver to look for `ipmitool` instead of `ipmipower`
14+
15 LP: #1581318 [1.9] Append version to templateUrl in maas.js angular code.
16
17+LP: #1591093 [2.0,1.9] 3rd party HP drivers (archive hostname renamed) - deployment fails
18+
19+
20 1.9.3
21 =====
22
23@@ -20,9 +27,13 @@
24 --------------
25
26 LP: #1521618 [1.9] wrong subnet in DHCP answer when multiple networks are present
27+
28 LP: #1536604 [1.9] IntegrityError while uploading leases - when there are reserved IP's on the dynamic range
29+
30 LP: #1580712 [1.9] dhcp update error: str object has no attribute mac
31+
32 LP: #1575567 [1.9] Re-commissioning doesn't detect storage changes
33+
34 LP: #1576194 [1.9] Enlistment via DHCP fails because DNS has bogus PTR record
35
36
37
38=== modified file 'etc/maas/drivers.yaml'
39--- etc/maas/drivers.yaml 2015-09-24 16:22:12 +0000
40+++ etc/maas/drivers.yaml 2016-06-10 16:36:35 +0000
41@@ -45,7 +45,7 @@
42 - 'pci:v00001137d00000046sv*sd*bc*sc*i*'
43 module: snic
44 package: snic-dkms
45- repository: http://ppa.launchpad.net/cisco-ucs-team/snic-stable/ubuntu
46+ repository: http://ppa.launchpad.net/cisco-ucs-team/snic-stable/ubuntu
47 - blacklist: ahci
48 comment: HPDSA driver
49 key_binary: !!binary |
50@@ -75,4 +75,4 @@
51 - 'pci:v0000103Cd0000193Fsv0000103Csd00003381bc*sc*i*'
52 module: hpdsa
53 package: hpdsa-dkms
54- repository: http://downloads.linux.hp.com/SDR/repo/ubuntu-hpdsa
55+ repository: http://downloads.linux.hpe.com/SDR/repo/ubuntu-hpdsa

Subscribers

People subscribed via source and target branches