)]}'
{"/COMMIT_MSG":[{"author":{"_account_id":6486,"name":"Brant Knudson","email":"blk@acm.org","username":"blk-u"},"change_message_id":"a1cb587e8b733e843aecd9adc589595a173c7418","unresolved":false,"context_lines":[{"line_number":20,"context_line":"validate_v2_token."},{"line_number":21,"context_line":""},{"line_number":22,"context_line":"Conflicts:"},{"line_number":23,"context_line":"\tkeystone/token/providers/fernet/core.py"},{"line_number":24,"context_line":""},{"line_number":25,"context_line":"Closes-Bug: #1515485"},{"line_number":26,"context_line":"Change-Id: I03f56c9c84389a6d6cdb3a6863fcbfca486af337"}],"source_content_type":"text/x-gerrit-commit-message","patch_set":2,"id":"ba8a016a_2bb9c02e","line":23,"updated":"2015-11-23 16:01:46.000000000","message":"why the conflict? can\u0027t we backport the other change(s)?","commit_id":"f66badae63b1544c3bcc83e0c1afc8e9cdc71bab"},{"author":{"_account_id":5046,"name":"Lance Bragstad","email":"lbragstad@redhat.com","username":"ldbragst"},"change_message_id":"41f80f403c9a7da7ebf982fc2a10c6c45b5cfe58","unresolved":false,"context_lines":[{"line_number":20,"context_line":"validate_v2_token."},{"line_number":21,"context_line":""},{"line_number":22,"context_line":"Conflicts:"},{"line_number":23,"context_line":"\tkeystone/token/providers/fernet/core.py"},{"line_number":24,"context_line":""},{"line_number":25,"context_line":"Closes-Bug: #1515485"},{"line_number":26,"context_line":"Change-Id: I03f56c9c84389a6d6cdb3a6863fcbfca486af337"}],"source_content_type":"text/x-gerrit-commit-message","patch_set":2,"id":"ba8a016a_f9e5c7a7","line":23,"in_reply_to":"ba8a016a_2bb9c02e","updated":"2015-11-23 18:33:32.000000000","message":"I don\u0027t think there are any other changes to backport? At least I can\u0027t tell from the conflict: \n\nhttp://cdn.pasteraw.com/lgrkdmwv68el3z2es37roplxsz82akz","commit_id":"f66badae63b1544c3bcc83e0c1afc8e9cdc71bab"},{"author":{"_account_id":6486,"name":"Brant Knudson","email":"blk@acm.org","username":"blk-u"},"change_message_id":"fa753702f767d1d02cab7768bc6b88663385e7d9","unresolved":false,"context_lines":[{"line_number":20,"context_line":"validate_v2_token."},{"line_number":21,"context_line":""},{"line_number":22,"context_line":"Conflicts:"},{"line_number":23,"context_line":"\tkeystone/token/providers/fernet/core.py"},{"line_number":24,"context_line":""},{"line_number":25,"context_line":"Closes-Bug: #1515485"},{"line_number":26,"context_line":"Change-Id: I03f56c9c84389a6d6cdb3a6863fcbfca486af337"}],"source_content_type":"text/x-gerrit-commit-message","patch_set":2,"id":"ba8a016a_6ed4acbc","line":23,"in_reply_to":"ba8a016a_f9e5c7a7","updated":"2015-11-23 19:13:55.000000000","message":"This change is removing the function, and here the function has:\n\n  self._build_issued_at_info(token, token_data)\n\nwhereas the master version doesn\u0027t have it... that came from https://review.openstack.org/#/c/212953/4/keystone/token/providers/fernet/core.py ... I need to push back on conflicts more because this is supposed to be the stable branch.","commit_id":"f66badae63b1544c3bcc83e0c1afc8e9cdc71bab"}]}