)]}'
{"id":"openstack%2Fdevstack-tools~428412","triplet_id":"openstack%2Fdevstack-tools~master~I6140a9cc03250c2774913121b274c855f443ba82","project":"openstack/devstack-tools","branch":"master","topic":"bug/1660458","hashtags":[],"change_id":"I6140a9cc03250c2774913121b274c855f443ba82","subject":"Fix for a bug when merging files using merge_lc","status":"ABANDONED","created":"2017-02-02 20:36:51.000000000","updated":"2017-03-22 21:44:06.000000000","total_comment_count":7,"unresolved_comment_count":0,"has_review_started":true,"meta_rev_id":"6bd02eb0bbeac8b86949827ea47b58658e035577","_number":428412,"virtual_id_number":428412,"owner":{"_account_id":9152,"name":"Castulo J. Martinez","email":"castulo.martinez@intel.com","username":"cas"},"actions":{},"labels":{"Verified":{"disliked":{"_account_id":3,"name":"Jenkins","username":"jenkins"},"all":[{"date":"2017-02-02 21:15:15.000000000","_account_id":9152,"name":"Castulo J. Martinez","email":"castulo.martinez@intel.com","username":"cas"},{"date":"2017-02-02 20:51:27.000000000","_account_id":9234,"name":"Steve Heyman","email":"steve@heyman.com","username":"hockeynut"},{"value":-1,"date":"2017-02-13 12:20:03.000000000","_account_id":3,"name":"Jenkins","username":"jenkins"},{"_account_id":23203,"name":"Kurtis Cobb","email":"kurtis.cobb@gmail.com","username":"kvcobb"},{"_account_id":17716,"name":"Luz Cazares","email":"luz.cazares@intel.com","username":"luzcazares"},{"_account_id":23204,"name":"Jonte Watford","email":"jonte.watford@intel.com","username":"jwatford"},{"_account_id":2750,"name":"Sean Dague","email":"sean@dague.net","username":"sdague"}],"values":{"-2":"Fails","-1":"Doesn\u0027t seem to work"," 0":"No score","+1":"Works for me","+2":"Verified"},"description":"","value":-1,"default_value":0,"optional":true},"Code-Review":{"recommended":{"_account_id":17716,"name":"Luz Cazares","email":"luz.cazares@intel.com","username":"luzcazares"},"disliked":{"_account_id":2750,"name":"Sean Dague","email":"sean@dague.net","username":"sdague"},"all":[{"value":0,"permitted_voting_range":{"min":-1,"max":1},"_account_id":9152,"name":"Castulo J. Martinez","email":"castulo.martinez@intel.com","username":"cas"},{"value":1,"date":"2017-02-02 21:31:20.000000000","permitted_voting_range":{"min":-1,"max":1},"_account_id":9234,"name":"Steve Heyman","email":"steve@heyman.com","username":"hockeynut"},{"value":0,"permitted_voting_range":{"min":-1,"max":1},"_account_id":3,"name":"Jenkins","username":"jenkins"},{"value":1,"date":"2017-02-02 22:13:08.000000000","permitted_voting_range":{"min":-1,"max":1},"_account_id":23203,"name":"Kurtis Cobb","email":"kurtis.cobb@gmail.com","username":"kvcobb"},{"value":1,"date":"2017-02-02 23:33:50.000000000","permitted_voting_range":{"min":-1,"max":1},"_account_id":17716,"name":"Luz Cazares","email":"luz.cazares@intel.com","username":"luzcazares"},{"value":1,"date":"2017-02-02 20:49:51.000000000","permitted_voting_range":{"min":-1,"max":1},"_account_id":23204,"name":"Jonte Watford","email":"jonte.watford@intel.com","username":"jwatford"},{"value":-1,"date":"2017-02-10 18:20:49.000000000","permitted_voting_range":{"min":-1,"max":1},"_account_id":2750,"name":"Sean Dague","email":"sean@dague.net","username":"sdague"}],"values":{"-2":"Do not merge","-1":"This patch needs further work before it can be merged"," 0":"No score","+1":"Looks good to me, but someone else must approve","+2":"Looks good to me (core reviewer)"},"description":"","value":-1,"default_value":0,"optional":true},"Workflow":{"all":[{"value":0,"permitted_voting_range":{"min":-1,"max":0},"_account_id":9152,"name":"Castulo J. Martinez","email":"castulo.martinez@intel.com","username":"cas"},{"_account_id":9234,"name":"Steve Heyman","email":"steve@heyman.com","username":"hockeynut"},{"_account_id":3,"name":"Jenkins","username":"jenkins"},{"_account_id":23203,"name":"Kurtis Cobb","email":"kurtis.cobb@gmail.com","username":"kvcobb"},{"_account_id":17716,"name":"Luz Cazares","email":"luz.cazares@intel.com","username":"luzcazares"},{"_account_id":23204,"name":"Jonte Watford","email":"jonte.watford@intel.com","username":"jwatford"},{"_account_id":2750,"name":"Sean Dague","email":"sean@dague.net","username":"sdague"}],"values":{"-1":"Work in progress"," 0":"Ready for reviews","+1":"Approved"},"description":"","default_value":0,"optional":true},"Review-Priority":{"all":[{"value":0,"permitted_voting_range":{"min":0,"max":2},"_account_id":9152,"name":"Castulo J. Martinez","email":"castulo.martinez@intel.com","username":"cas"},{"value":0,"permitted_voting_range":{"min":0,"max":2},"_account_id":9234,"name":"Steve Heyman","email":"steve@heyman.com","username":"hockeynut"},{"value":0,"permitted_voting_range":{"min":0,"max":2},"_account_id":3,"name":"Jenkins","username":"jenkins"},{"value":0,"permitted_voting_range":{"min":0,"max":2},"_account_id":23203,"name":"Kurtis Cobb","email":"kurtis.cobb@gmail.com","username":"kvcobb"},{"value":0,"permitted_voting_range":{"min":0,"max":2},"_account_id":17716,"name":"Luz Cazares","email":"luz.cazares@intel.com","username":"luzcazares"},{"value":0,"permitted_voting_range":{"min":0,"max":2},"_account_id":23204,"name":"Jonte Watford","email":"jonte.watford@intel.com","username":"jwatford"},{"value":0,"permitted_voting_range":{"min":0,"max":2},"_account_id":2750,"name":"Sean Dague","email":"sean@dague.net","username":"sdague"}],"values":{"-1":"Branch Freeze"," 0":"No Priority","+1":"Important Change","+2":"Gate Blocker Fix / Urgent Change"},"description":"","default_value":0,"optional":true}},"removable_reviewers":[],"reviewers":{"REVIEWER":[{"_account_id":3,"name":"Jenkins","username":"jenkins"},{"_account_id":2750,"name":"Sean Dague","email":"sean@dague.net","username":"sdague"},{"_account_id":9152,"name":"Castulo J. Martinez","email":"castulo.martinez@intel.com","username":"cas"},{"_account_id":9234,"name":"Steve Heyman","email":"steve@heyman.com","username":"hockeynut"},{"_account_id":17716,"name":"Luz Cazares","email":"luz.cazares@intel.com","username":"luzcazares"},{"_account_id":23203,"name":"Kurtis Cobb","email":"kurtis.cobb@gmail.com","username":"kvcobb"},{"_account_id":23204,"name":"Jonte Watford","email":"jonte.watford@intel.com","username":"jwatford"}]},"pending_reviewers":{},"reviewer_updates":[{"updated":"2017-02-02 20:49:51.000000000","updated_by":{"_account_id":23204,"name":"Jonte Watford","email":"jonte.watford@intel.com","username":"jwatford"},"reviewer":{"_account_id":23204,"name":"Jonte Watford","email":"jonte.watford@intel.com","username":"jwatford"},"state":"REVIEWER"},{"updated":"2017-02-02 20:51:27.000000000","updated_by":{"_account_id":9234,"name":"Steve Heyman","email":"steve@heyman.com","username":"hockeynut"},"reviewer":{"_account_id":9234,"name":"Steve Heyman","email":"steve@heyman.com","username":"hockeynut"},"state":"REVIEWER"},{"updated":"2017-02-02 22:13:08.000000000","updated_by":{"_account_id":23203,"name":"Kurtis Cobb","email":"kurtis.cobb@gmail.com","username":"kvcobb"},"reviewer":{"_account_id":23203,"name":"Kurtis Cobb","email":"kurtis.cobb@gmail.com","username":"kvcobb"},"state":"REVIEWER"},{"updated":"2017-02-02 23:33:50.000000000","updated_by":{"_account_id":17716,"name":"Luz Cazares","email":"luz.cazares@intel.com","username":"luzcazares"},"reviewer":{"_account_id":17716,"name":"Luz Cazares","email":"luz.cazares@intel.com","username":"luzcazares"},"state":"REVIEWER"},{"updated":"2017-02-10 18:20:49.000000000","updated_by":{"_account_id":2750,"name":"Sean Dague","email":"sean@dague.net","username":"sdague"},"reviewer":{"_account_id":2750,"name":"Sean Dague","email":"sean@dague.net","username":"sdague"},"state":"REVIEWER"},{"updated":"2017-02-13 12:20:03.000000000","updated_by":{"_account_id":3,"name":"Jenkins","username":"jenkins"},"reviewer":{"_account_id":3,"name":"Jenkins","username":"jenkins"},"state":"REVIEWER"}],"messages":[{"id":"8b62535336c37f2b22459ec1619f3080421294a0","author":{"_account_id":9152,"name":"Castulo J. Martinez","email":"castulo.martinez@intel.com","username":"cas"},"date":"2017-02-02 20:36:51.000000000","message":"Uploaded patch set 1.","accounts_in_message":[],"_revision_number":1},{"id":"07be09803e7411001b0cc5374a15221597c1369a","author":{"_account_id":3,"name":"Jenkins","username":"jenkins"},"date":"2017-02-02 20:41:04.000000000","message":"Patch Set 1: Verified+1\n\nBuild succeeded (check pipeline).\n\n- gate-devstack-tools-python35 http://logs.openstack.org/12/428412/1/check/gate-devstack-tools-python35/92d521d/ : SUCCESS in 2m 21s\n- gate-devstack-tools-pep8-ubuntu-xenial http://logs.openstack.org/12/428412/1/check/gate-devstack-tools-pep8-ubuntu-xenial/88b68cc/ : SUCCESS in 2m 52s","accounts_in_message":[],"_revision_number":1},{"id":"ca6b2bf6fa4a8d59b734a493e6df902ec81f24ef","author":{"_account_id":23204,"name":"Jonte Watford","email":"jonte.watford@intel.com","username":"jwatford"},"date":"2017-02-02 20:49:51.000000000","message":"Patch Set 1: Code-Review+1","accounts_in_message":[],"_revision_number":1},{"id":"66920400a309032aa112f46424b4003e579bd873","author":{"_account_id":9234,"name":"Steve Heyman","email":"steve@heyman.com","username":"hockeynut"},"date":"2017-02-02 20:51:27.000000000","message":"Patch Set 1:\n\n(3 comments)","accounts_in_message":[],"_revision_number":1},{"id":"bcc64d2df87d83b828d9664e65e98f72b8714e28","author":{"_account_id":9152,"name":"Castulo J. Martinez","email":"castulo.martinez@intel.com","username":"cas"},"date":"2017-02-02 21:15:15.000000000","message":"Patch Set 1:\n\n(2 comments)","accounts_in_message":[],"_revision_number":1},{"id":"ae4152baad5d0f95e434cf49634221bb97d9f5a8","author":{"_account_id":9234,"name":"Steve Heyman","email":"steve@heyman.com","username":"hockeynut"},"date":"2017-02-02 21:31:20.000000000","message":"Patch Set 1: Code-Review+1\n\n(1 comment)","accounts_in_message":[],"_revision_number":1},{"id":"9be8fa7052b9d6fb1c1aeb75db64fcf6f6ab26a8","author":{"_account_id":23203,"name":"Kurtis Cobb","email":"kurtis.cobb@gmail.com","username":"kvcobb"},"date":"2017-02-02 22:13:08.000000000","message":"Patch Set 1: Code-Review+1","accounts_in_message":[],"_revision_number":1},{"id":"5be893bb62a97853c7f973258a8de2497ef7c87e","author":{"_account_id":17716,"name":"Luz Cazares","email":"luz.cazares@intel.com","username":"luzcazares"},"date":"2017-02-02 23:33:50.000000000","message":"Patch Set 1: Code-Review+1\n\n(1 comment)\n\nNice catch","accounts_in_message":[],"_revision_number":1},{"id":"1e775a3f9cca988aa8d4e2a200a4876782e9fa13","author":{"_account_id":2750,"name":"Sean Dague","email":"sean@dague.net","username":"sdague"},"date":"2017-02-10 18:20:49.000000000","message":"Patch Set 1: Code-Review-1\n\nI\u0027m really dubious of doing it this way, because we\u0027re starting to get to the point of putting a shell interpreter into this tooling.\n\nEspecially given that the prescribed way to adjust ENABLED_SERVICES once it\u0027s created is via enable_/disable_ service, which should stack up correctly here.\n\nIs there an upstream test configuration that\u0027s failing that we can fix, or is this a 3rd party CI thing that we don\u0027t have visibility to.","accounts_in_message":[],"_revision_number":1},{"id":"22542691414b36833ba50865fef4439df86b4774","author":{"_account_id":3,"name":"Jenkins","username":"jenkins"},"date":"2017-02-13 12:20:03.000000000","message":"Patch Set 1: Verified-1\n\nMerge Failed.\n\nThis change or one of its cross-repo dependencies was unable to be automatically merged with the current state of its repository. Please rebase the change and upload a new patchset.","accounts_in_message":[],"_revision_number":1},{"id":"ed01157f9504211736c62f0cd80ac3037bc3ef1e","author":{"_account_id":9152,"name":"Castulo J. Martinez","email":"castulo.martinez@intel.com","username":"cas"},"date":"2017-03-22 21:44:06.000000000","message":"Abandoned","accounts_in_message":[],"_revision_number":1}],"current_revision_number":1,"current_revision":"da0e3e53670c3c0497d5680bb0c468aa906f398f","revisions":{"da0e3e53670c3c0497d5680bb0c468aa906f398f":{"kind":"REWORK","_number":1,"created":"2017-02-02 20:36:51.000000000","uploader":{"_account_id":9152,"name":"Castulo J. Martinez","email":"castulo.martinez@intel.com","username":"cas"},"ref":"refs/changes/12/428412/1","fetch":{"anonymous http":{"url":"https://review.opendev.org/openstack/devstack-tools","ref":"refs/changes/12/428412/1","commands":{"Checkout":"git fetch https://review.opendev.org/openstack/devstack-tools refs/changes/12/428412/1 \u0026\u0026 git checkout FETCH_HEAD","Cherry Pick":"git fetch https://review.opendev.org/openstack/devstack-tools refs/changes/12/428412/1 \u0026\u0026 git cherry-pick FETCH_HEAD","Format Patch":"git fetch https://review.opendev.org/openstack/devstack-tools refs/changes/12/428412/1 \u0026\u0026 git format-patch -1 --stdout FETCH_HEAD","Pull":"git pull https://review.opendev.org/openstack/devstack-tools refs/changes/12/428412/1"}}},"commit":{"parents":[{"commit":"1384ec992db4ea1692e66427dfa56edfe9a75528","subject":"add tests for merging lines beyond a\u003db","web_links":[{"name":"gitea","tooltip":"Open in GitWeb","url":"https://opendev.org/openstack/devstack-tools/commit/1384ec992db4ea1692e66427dfa56edfe9a75528"}]}],"author":{"name":"Castulo J. Martinez","email":"castulo.martinez@intel.com","date":"2017-02-02 19:31:23.000000000","tz":-480},"committer":{"name":"Castulo J. Martinez","email":"castulo.martinez@intel.com","date":"2017-02-02 19:31:23.000000000","tz":-480},"subject":"Fix for a bug when merging files using merge_lc","message":"Fix for a bug when merging files using merge_lc\n\nThere is bug in merge_lc that causes variables that have\n+\u003d to be overwritten when merging two config files.\nA variable of the form variable+\u003dvalue is being treated the\nsame way variable\u003dvalue is being treated, so when the\nfiles are being merged, if there are multiple lines with\nvar+\u003dvalue1, var\u003dvalue2, var+\u003dvalue3, etc, all of them\nwould be overwritten and only the left one would be left\nin the merged file.\n\nThis commit fixes that so when merging two files, if there\nare variables that are adding values, they will all be kept,\nwhich is the intended purpose of using +\u003d.\n\nChange-Id: I6140a9cc03250c2774913121b274c855f443ba82\nCloses-bug: 1660458\n","web_links":[{"name":"gitea","tooltip":"Open in GitWeb","url":"https://opendev.org/openstack/devstack-tools/commit/da0e3e53670c3c0497d5680bb0c468aa906f398f"}],"resolve_conflicts_web_links":[{"name":"gitea","tooltip":"Open in GitWeb","url":"https://opendev.org/openstack/devstack-tools/commit/da0e3e53670c3c0497d5680bb0c468aa906f398f"}]},"branch":"refs/heads/master"}},"requirements":[],"submit_records":[],"submit_requirements":[]}