NOTE(takashin):
The conflicts are due to Iab366da7623e5e31b8416e89fee7d418f7bf9b30.
This patch should have been merged to stable/queens before
Iab366da7623e5e31b8416e89fee7d418f7bf9b30!
Change-Id: I306ac6f5c6b67d77d91a7ba24d4d863ab3e1bf5c
Closes-Bug: #1734625
(cherry picked from commit ab4efbba61fb0dd0266e42e48555f80ddde72efd)
Reviewed: https:/ /review. openstack. org/543116 /git.openstack. org/cgit/ openstack/ nova/commit/ ?id=d49a6b8999c 4b4986ea0ac0ce9 f1dca2c076ee17
Committed: https:/
Submitter: Zuul
Branch: stable/queens
commit d49a6b8999c4b49 86ea0ac0ce9f1dc a2c076ee17
Author: Takashi NATSUME <email address hidden>
Date: Fri Jan 5 11:42:17 2018 +0900
[placement] Add sending global request ID in get
Add the 'X-Openstack- Request- Id' header Client.
in the request of GET in SchedulerReport
Conflicts: scheduler/ client/ report. py tests/functiona l/api/openstack /placement/ test_report_ client. py tests/unit/ scheduler/ client/ test_report. py
nova/
nova/
nova/
NOTE(takashin): 31b8416e89fee7d 418f7bf9b30. 623e5e31b8416e8 9fee7d418f7bf9b 30!
The conflicts are due to Iab366da7623e5e
This patch should have been merged to stable/queens before
Iab366da7
Change-Id: I306ac6f5c6b67d 77d91a7ba24d4d8 63ab3e1bf5c 0266e42e48555f8 0ddde72efd)
Closes-Bug: #1734625
(cherry picked from commit ab4efbba61fb0dd