)]}'
{"kolla/common/config.py":[{"author":{"_account_id":7488,"name":"Jeffrey Zhang","email":"zhang.lei.fly@gmail.com","username":"Jeffrey4l"},"change_message_id":"284451de736a5126d7b491dbb1297561ebfddd54","unresolved":false,"context_lines":[{"line_number":140,"context_line":"               help\u003d\u0027The MAINTAINER field\u0027),"},{"line_number":141,"context_line":"    cfg.ListOpt(\u0027rpm_setup_config\u0027, default\u003d[DELOREAN, DELOREAN_DEPS],"},{"line_number":142,"context_line":"                deprecated_group\u003d\u0027kolla-build\u0027,"},{"line_number":143,"context_line":"                help\u003d(\u0027Comma separated list of .rpm or .repo file(s)\u0027"},{"line_number":144,"context_line":"                      \u0027or URL(s) to install before building containers\u0027)),"},{"line_number":145,"context_line":"    cfg.StrOpt(\u0027apt_sources_list\u0027, help\u003d(\u0027Path to custom sources.list\u0027)),"},{"line_number":146,"context_line":"    cfg.StrOpt(\u0027apt_preferences\u0027, help\u003d(\u0027Path to custom apt/preferences\u0027))"}],"source_content_type":"text/x-python","patch_set":2,"id":"5a5ae5dd_fece4182","line":143,"updated":"2016-02-03 15:34:17.000000000","message":"pls add the last space back here.","commit_id":"9c74d6c2bb1629f56121a5b9902f40df9cbfc5d6"},{"author":{"_account_id":14119,"name":"Sam Yaple","email":"sam+git@yaple.net","username":"SamYaple"},"change_message_id":"aacc6d92aa89bdb5d4ab57a5a34c95aabee9799e","unresolved":false,"context_lines":[{"line_number":140,"context_line":"               help\u003d\u0027The MAINTAINER field\u0027),"},{"line_number":141,"context_line":"    cfg.ListOpt(\u0027rpm_setup_config\u0027, default\u003d[DELOREAN, DELOREAN_DEPS],"},{"line_number":142,"context_line":"                deprecated_group\u003d\u0027kolla-build\u0027,"},{"line_number":143,"context_line":"                help\u003d(\u0027Comma separated list of .rpm or .repo file(s)\u0027"},{"line_number":144,"context_line":"                      \u0027or URL(s) to install before building containers\u0027)),"},{"line_number":145,"context_line":"    cfg.StrOpt(\u0027apt_sources_list\u0027, help\u003d(\u0027Path to custom sources.list\u0027)),"},{"line_number":146,"context_line":"    cfg.StrOpt(\u0027apt_preferences\u0027, help\u003d(\u0027Path to custom apt/preferences\u0027))"}],"source_content_type":"text/x-python","patch_set":2,"id":"5a5ae5dd_f5ac1fef","line":143,"in_reply_to":"5a5ae5dd_fece4182","updated":"2016-02-03 15:56:35.000000000","message":"ah! i was wondering why it was in merge conflict. I completely missed that","commit_id":"9c74d6c2bb1629f56121a5b9902f40df9cbfc5d6"}]}