Merge ~bryce/ubuntu/+source/heat:master into ubuntu/+source/heat:ubuntu/devel
Status: | Merged | ||||
---|---|---|---|---|---|
Merge reported by: | Bryce Harrington | ||||
Merged at revision: | 32a6115812f8669078b197429808de80905fc4a8 | ||||
Proposed branch: | ~bryce/ubuntu/+source/heat:master | ||||
Merge into: | ubuntu/+source/heat:ubuntu/devel | ||||
Diff against target: |
16 lines (+4/-0) (has conflicts) 1 file modified
debian/tests/heat-daemons (+4/-0) Conflict in debian/tests/heat-daemons |
||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Christian Ehrhardt (community) | Needs Information | ||
Review via email: mp+391390@code.qastaging.launchpad.net |
Description of the change
python-osprofiler and python-
The test log indicates the test is timing out after 25 seconds waiting for heat-engine to come out. However, unfortunately there is an error in the test code that makes it fail to display, so the actual error (if any) are not shown.
This patch changes 'tail -100' to 'tail -n 100' to correct this. Hopefully that will facilitate diagnosing the actual issue.
There was an error fetching revisions from git servers. Please try again in a few minutes. If the problem persists, contact Launchpad support.
This isn't really targetted at anyone - should this go to Chris maybe? oslo-serializat ion | 2.24.0-0ubuntu2 | bionic/universe | all
Also the diff has some oddities is the merge target right?
And finally
python-osprofiler | 3.4.0-0ubuntu1 | groovy | source
migrated and
python-
isn't in groovy at all.
Sorry I'm puzzled for now ...