Merge lp://staging/~andreserl/maas/lp1673724_2.1 into lp://staging/maas/2.1
Proposed by
Andres Rodriguez
| Status: | Merged |
|---|---|
| Approved by: | Andres Rodriguez |
| Approved revision: | no longer in the source branch. |
| Merged at revision: | 5595 |
| Proposed branch: | lp://staging/~andreserl/maas/lp1673724_2.1 |
| Merge into: | lp://staging/maas/2.1 |
| Diff against target: |
56 lines (+6/-4) 3 files modified
docs/changelog.rst (+2/-0) src/provisioningserver/refresh/node_info_scripts.py (+1/-1) src/provisioningserver/refresh/tests/test_node_info_scripts.py (+3/-3) |
| To merge this branch: | bzr merge lp://staging/~andreserl/maas/lp1673724_2.1 |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Andres Rodriguez (community) | Approve | ||
|
Review via email:
|
|||
Commit message
Backport r5837,r5841 from lp:maas: Filter lsblk by maj,min.
This filters lsblk output by major,minor device number. This should ensure the first disk is always listed first (i.e. 'sda')
To post a comment you must log in.
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
selfie!