)]}'
{"/COMMIT_MSG":[{"author":{"_account_id":6873,"name":"Matt Riedemann","email":"mriedem.os@gmail.com","username":"mriedem"},"change_message_id":"01f9b4c2c0779b72200860d696f89953df73a317","unresolved":false,"context_lines":[{"line_number":19,"context_line":"This commit adds support for domain detection with system-scoped"},{"line_number":20,"context_line":"tokens."},{"line_number":21,"context_line":""},{"line_number":22,"context_line":"Conflicts:"},{"line_number":23,"context_line":"      keystone/server/flask/common.py"},{"line_number":24,"context_line":"      keystone/tests/unit/test_v3_auth.py"},{"line_number":25,"context_line":""},{"line_number":26,"context_line":"This backport has conflicts with keystone/server/flask/common.py due"},{"line_number":27,"context_line":"to a massive refactor to get keystone off python-paste that started in"},{"line_number":28,"context_line":"Rocky and spilled over into Stein. The change is functionally"},{"line_number":29,"context_line":"equivalent to the patch merged to Train but done in"},{"line_number":30,"context_line":"keystone/common/controller.py instead of"},{"line_number":31,"context_line":"keystone/server/flask/common.py. There was also some changes to the"},{"line_number":32,"context_line":"test since it didn\u0027t have the flask test client available to call the"},{"line_number":33,"context_line":"application with. Instead, we\u0027re using the old `self.get` utility"},{"line_number":34,"context_line":"methods for functionally testing the API."},{"line_number":35,"context_line":""},{"line_number":36,"context_line":"Change-Id: I8f0f7a623a1741f461493d872849fae7ef3e8077"},{"line_number":37,"context_line":"Closes-Bug: 1843609"}],"source_content_type":"text/x-gerrit-commit-message","patch_set":4,"id":"3fa7e38b_3b9c4b5a","line":34,"range":{"start_line":22,"start_character":0,"end_line":34,"end_character":41},"updated":"2019-10-22 19:16:56.000000000","message":"If you cherry-pick from the stable/rocky change then I\u0027m assuming this all goes away and we don\u0027t need to re-do the conflict resolution, right? That\u0027s why it\u0027s generally best to go in order and cherry pick from like train -\u003e stein -\u003e rocky -\u003e queens so that if you have to resolve conflicts going from say stein to rocky you don\u0027t need to redo the same conflict fix when going from rocky to queens.","commit_id":"9ca2c605b94506a7dfa411dd15cd61cc65f78045"},{"author":{"_account_id":5046,"name":"Lance Bragstad","email":"lbragstad@redhat.com","username":"ldbragst"},"change_message_id":"bd4299788e5e6bddf176fd48288a630199dacacf","unresolved":false,"context_lines":[{"line_number":19,"context_line":"This commit adds support for domain detection with system-scoped"},{"line_number":20,"context_line":"tokens."},{"line_number":21,"context_line":""},{"line_number":22,"context_line":"Conflicts:"},{"line_number":23,"context_line":"      keystone/server/flask/common.py"},{"line_number":24,"context_line":"      keystone/tests/unit/test_v3_auth.py"},{"line_number":25,"context_line":""},{"line_number":26,"context_line":"This backport has conflicts with keystone/server/flask/common.py due"},{"line_number":27,"context_line":"to a massive refactor to get keystone off python-paste that started in"},{"line_number":28,"context_line":"Rocky and spilled over into Stein. The change is functionally"},{"line_number":29,"context_line":"equivalent to the patch merged to Train but done in"},{"line_number":30,"context_line":"keystone/common/controller.py instead of"},{"line_number":31,"context_line":"keystone/server/flask/common.py. There was also some changes to the"},{"line_number":32,"context_line":"test since it didn\u0027t have the flask test client available to call the"},{"line_number":33,"context_line":"application with. Instead, we\u0027re using the old `self.get` utility"},{"line_number":34,"context_line":"methods for functionally testing the API."},{"line_number":35,"context_line":""},{"line_number":36,"context_line":"Change-Id: I8f0f7a623a1741f461493d872849fae7ef3e8077"},{"line_number":37,"context_line":"Closes-Bug: 1843609"}],"source_content_type":"text/x-gerrit-commit-message","patch_set":4,"id":"3fa7e38b_8101506d","line":34,"range":{"start_line":22,"start_character":0,"end_line":34,"end_character":41},"in_reply_to":"3fa7e38b_3b9c4b5a","updated":"2019-10-22 20:22:49.000000000","message":"Done. That makes sense.\n\nFWIW - we\u0027re still going to have a conflict here since the ``token`` variable changed (``token_ref`` -\u003e ``token``).","commit_id":"9ca2c605b94506a7dfa411dd15cd61cc65f78045"},{"author":{"_account_id":6873,"name":"Matt Riedemann","email":"mriedem.os@gmail.com","username":"mriedem"},"change_message_id":"1df0f6cbfec307cc10525d4ea282b3ce92a1fb6d","unresolved":false,"context_lines":[{"line_number":19,"context_line":"This commit adds support for domain detection with system-scoped"},{"line_number":20,"context_line":"tokens."},{"line_number":21,"context_line":""},{"line_number":22,"context_line":"Conflicts:"},{"line_number":23,"context_line":"      keystone/server/flask/common.py"},{"line_number":24,"context_line":""},{"line_number":25,"context_line":"This backport has conflicts with keystone/server/flask/common.py due to"},{"line_number":26,"context_line":"a massive refactor to get keystone off python-paste that started in"},{"line_number":27,"context_line":"Rocky and spilled over into Stein. The change is functionally equivalent"},{"line_number":28,"context_line":"to the patch merged to Train but done in keystone/common/controller.py"},{"line_number":29,"context_line":"instead of keystone/server/flask/common.py. There was also some changes"},{"line_number":30,"context_line":"to the test since it didn\u0027t have a utility method to obtain a"},{"line_number":31,"context_line":"system-scoped token."},{"line_number":32,"context_line":""},{"line_number":33,"context_line":"Change-Id: I8f0f7a623a1741f461493d872849fae7ef3e8077"},{"line_number":34,"context_line":"Closes-Bug: 1843609"}],"source_content_type":"text/x-gerrit-commit-message","patch_set":5,"id":"3fa7e38b_735507fa","line":31,"range":{"start_line":22,"start_character":0,"end_line":31,"end_character":20},"updated":"2019-10-22 20:45:48.000000000","message":"This is from the stable/rocky backport but is not the same conflict for queens is it? IOW could this be updated so it\u0027s queens specific?","commit_id":"2737e3ba3468fa3dd9b53dc24ea7cfd7948b132f"},{"author":{"_account_id":5046,"name":"Lance Bragstad","email":"lbragstad@redhat.com","username":"ldbragst"},"change_message_id":"bbc1e76b3a7a8f0e95babfcd3a06ac4445e5f8bc","unresolved":false,"context_lines":[{"line_number":19,"context_line":"This commit adds support for domain detection with system-scoped"},{"line_number":20,"context_line":"tokens."},{"line_number":21,"context_line":""},{"line_number":22,"context_line":"Conflicts:"},{"line_number":23,"context_line":"      keystone/server/flask/common.py"},{"line_number":24,"context_line":""},{"line_number":25,"context_line":"This backport has conflicts with keystone/server/flask/common.py due to"},{"line_number":26,"context_line":"a massive refactor to get keystone off python-paste that started in"},{"line_number":27,"context_line":"Rocky and spilled over into Stein. The change is functionally equivalent"},{"line_number":28,"context_line":"to the patch merged to Train but done in keystone/common/controller.py"},{"line_number":29,"context_line":"instead of keystone/server/flask/common.py. There was also some changes"},{"line_number":30,"context_line":"to the test since it didn\u0027t have a utility method to obtain a"},{"line_number":31,"context_line":"system-scoped token."},{"line_number":32,"context_line":""},{"line_number":33,"context_line":"Change-Id: I8f0f7a623a1741f461493d872849fae7ef3e8077"},{"line_number":34,"context_line":"Closes-Bug: 1843609"}],"source_content_type":"text/x-gerrit-commit-message","patch_set":5,"id":"3fa7e38b_939a0360","line":31,"range":{"start_line":22,"start_character":0,"end_line":31,"end_character":20},"in_reply_to":"3fa7e38b_735507fa","updated":"2019-10-22 21:12:31.000000000","message":"Done","commit_id":"2737e3ba3468fa3dd9b53dc24ea7cfd7948b132f"}]}