~newell-jensen/maas:2.2-fix-1686678

Branch merges

Propose for merging

Merged into maas:2.2

Newell Jensen (community): Approve on 2017-07-07

Diff: 421 lines (+132/-19)

9 files modified

docs/changelog.rst (+2/-0)
src/maasserver/forms/__init__.py (+6/-1)
src/maasserver/forms/tests/test_controller.py (+13/-0)
src/maasserver/static/js/angular/controllers/node_details.js (+25/-2)
src/maasserver/static/js/angular/controllers/tests/test_node_details.js (+64/-4)
src/maasserver/static/partials/node-details.html (+6/-4)
src/maasserver/websockets/handlers/controller.py (+10/-2)
src/maasserver/websockets/handlers/tests/test_controller.py (+4/-4)
src/maasserver/websockets/protocol.py (+2/-2)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related charm recipes

741d085... by Newell Jensen on 2017-07-07

Merge with 2.2

a21ed89... by Newell Jensen on 2017-07-07

Update CHANGELOG.

38ef687... by Newell Jensen on 2017-07-05

Allows the domain of controllers to be changed in the UI.

d6e7440... by Andres Rodriguez on 2017-07-07

Add CHANGELOG entry for 2.2.2

bf2ab1f... by Andres Rodriguez on 2017-07-06

Merge packaging into 2.2

2a6d96e... by Blake Rouse on 2017-07-06

Backport d39a0e21fd14125a6cceb45cd692d34051f4a474 from master: Fix machinesTable directive so that it works with vs-repeat.

The machines, filteredMachines, and osinfo where placed on the scope directly. Once vs-repeat was added it changed the scope inside the directive to be the scope of vs-repeat and not the scope of machines-table. Moving those variables to the table variable on the machines-table scope fixes the issue as the table object will be copied by reference into the nested vs-repeat scope.

0adb563... by Andres Rodriguez on 2017-07-03

Update CHANGELOG

cab4bf5... by Lee Trager on 2017-07-03

Backport from master: Run badblocks using the physical blocksize of the disk.

By default badblocks always runs using a blocksize of 1024 and uses a 32bit int for the number of blocks it can test. For large disks the number of blocks exceeds the 32bit int limit and causes badblocks to fail. Many large uses use a larger physical blocksize which avoids hitting the 32bit int limit which helps avoid hitting LP:1695229.

88f916f... by Blake Rouse on 2017-07-03

Use calc-snap-version to generate the snap name.

Backport of be118a137d38299060fd323c98c9b1bc44ff2569 and d2e085af59091bfecffe181f4532ab898501aa09 from master.

b846c16... by Andres Rodriguez on 2017-07-03

Update CHANGELOG