)]}'
{"nova/tests/functional/test_servers.py":[{"author":{"_account_id":6873,"name":"Matt Riedemann","email":"mriedem.os@gmail.com","username":"mriedem"},"change_message_id":"8f805757564c985c85e5058267a54ac8fd3bf58e","unresolved":false,"context_lines":[{"line_number":1190,"context_line":"            self.assertEqual(old_flavor[\u0027disk\u0027] + new_flavor[\u0027disk\u0027],"},{"line_number":1191,"context_line":"                             allocation[\u0027DISK_GB\u0027])"},{"line_number":1192,"context_line":""},{"line_number":1193,"context_line":"        rp_uuid \u003d _get_provider_uuid()"},{"line_number":1194,"context_line":"        # make sure we start with no usage on the compute node"},{"line_number":1195,"context_line":"        rp_usages \u003d _get_provider_usages(rp_uuid)"},{"line_number":1196,"context_line":"        self.assertEqual({\u0027VCPU\u0027: 0, \u0027MEMORY_MB\u0027: 0, \u0027DISK_GB\u0027: 0}, rp_usages)"}],"source_content_type":"text/x-python","patch_set":1,"id":"ff82abbf_1f71b50c","line":1193,"updated":"2017-11-27 20:26:45.000000000","message":"Need to call this conflict out in the commit message as well.","commit_id":"3bbe6fe43c9649e303e6df19a4b1ba32dd6e7975"}]}