~andreserl/maas/qa-lab-tests-pause

Viewing all changes in revision 459.3.60.

  • Committer: Brendan Donegan
  • Date: 2017-03-13 11:11:00 UTC
  • mfrom: (484 qa-lab-tests)
  • mto: This revision was merged to the branch mainline in revision 485.
  • Revision ID: brendan.donegan@canonical.com-20170313111100-snxzhzj50sf5jc1j
Merge from trunk and resolve conflicts

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: