)]}'
{"doc/source/developing.rst":[{"author":{"_account_id":6482,"name":"Steve Martinelli","email":"s.martinelli@gmail.com","username":"stevemar"},"change_message_id":"0ec78313f91f8c2a43bd03621672d65dfee25be6","unresolved":false,"context_lines":[{"line_number":485,"context_line":":py:mod::`keystone.common.config`, a new sample configuration file needs to be"},{"line_number":486,"context_line":"generated. This can be done either in the commit that changes the config"},{"line_number":487,"context_line":"options or in a separate commit at the developer\u0027s discretion. Note that if the"},{"line_number":488,"context_line":"config file update is in the same commit as the developer may have to resolve"},{"line_number":489,"context_line":"merge conflicts more often."},{"line_number":490,"context_line":""},{"line_number":491,"context_line":"To generate a new sample configuration to be included in a commit run:"}],"source_content_type":"text/x-rst","patch_set":1,"id":"fa32b979_117ffae0","line":488,"updated":"2015-06-24 02:05:15.000000000","message":"this sentence needs to be tweaked, i think you are missing a word or two here","commit_id":"67249b879acbb712a9b629e2c37681f3381d8192"},{"author":{"_account_id":1941,"name":"Lin Hua Cheng","email":"os.lcheng@gmail.com","username":"lin-hua-cheng"},"change_message_id":"134bbeb8b4989b211869189143de825001979fe7","unresolved":false,"context_lines":[{"line_number":481,"context_line":":py:mod:`keystone.common.config`, a new sample configuration file needs to be"},{"line_number":482,"context_line":"generated. This can be done either in the commit that changes the config"},{"line_number":483,"context_line":"options or in a separate commit at the developer\u0027s discretion. Note that if the"},{"line_number":484,"context_line":"config file update is in the same commit as the developer may have to resolve"},{"line_number":485,"context_line":"merge conflicts more often."},{"line_number":486,"context_line":""},{"line_number":487,"context_line":"To generate a new sample configuration to be included in a commit run:"}],"source_content_type":"text/x-rst","patch_set":3,"id":"fa32b979_4ed9f021","line":484,"updated":"2015-06-26 02:36:49.000000000","message":"\"same commit as the developer..\" sounds weird,  should it be \"same commit,  the developer\" ?","commit_id":"832bb51c06f58cff9a63b5aea00600f459f5f99f"},{"author":{"_account_id":8119,"name":"Eric Brown","email":"eric_wade_brown@yahoo.com","username":"ericwb"},"change_message_id":"e2bb6aaf856379b3f7e991d0f1e8ba16e16a7d4f","unresolved":false,"context_lines":[{"line_number":481,"context_line":":py:mod:`keystone.common.config`, a new sample configuration file needs to be"},{"line_number":482,"context_line":"generated. This can be done either in the commit that changes the config"},{"line_number":483,"context_line":"options or in a separate commit at the developer\u0027s discretion. Note that if the"},{"line_number":484,"context_line":"config file update is in the same commit as the developer may have to resolve"},{"line_number":485,"context_line":"merge conflicts more often."},{"line_number":486,"context_line":""},{"line_number":487,"context_line":"To generate a new sample configuration to be included in a commit run:"}],"source_content_type":"text/x-rst","patch_set":3,"id":"fa32b979_21e9e5b7","line":484,"updated":"2015-06-27 15:10:13.000000000","message":"Better as:\n\nNote that if the config file update is in the same commit, the developer may have to resolve merge conflicts more often.","commit_id":"832bb51c06f58cff9a63b5aea00600f459f5f99f"},{"author":{"_account_id":6486,"name":"Brant Knudson","email":"blk@acm.org","username":"blk-u"},"change_message_id":"b74f351c9a6c77270f0e72ed8fe6e13d01284da1","unresolved":false,"context_lines":[{"line_number":481,"context_line":":py:mod:`keystone.common.config`, a new sample configuration file needs to be"},{"line_number":482,"context_line":"generated. This can be done either in the commit that changes the config"},{"line_number":483,"context_line":"options or in a separate commit at the developer\u0027s discretion. Note that if the"},{"line_number":484,"context_line":"config file update is in the same commit as the developer may have to resolve"},{"line_number":485,"context_line":"merge conflicts more often."},{"line_number":486,"context_line":""},{"line_number":487,"context_line":"To generate a new sample configuration to be included in a commit run:"}],"source_content_type":"text/x-rst","patch_set":3,"id":"fa32b979_ee93e1fe","line":484,"in_reply_to":"fa32b979_21e9e5b7","updated":"2015-06-28 15:59:16.000000000","message":"Done","commit_id":"832bb51c06f58cff9a63b5aea00600f459f5f99f"},{"author":{"_account_id":13055,"name":"Alexander Makarov","email":"ajiekcahdp.makapob@gmail.com","username":"amakarov"},"change_message_id":"e239792b3d60bd6f934f2f8ab71d4976bcf76488","unresolved":false,"context_lines":[{"line_number":481,"context_line":":py:mod:`keystone.common.config`, a new sample configuration file needs to be"},{"line_number":482,"context_line":"generated. This can be done either in the commit that changes the config"},{"line_number":483,"context_line":"options or in a separate commit at the developer\u0027s discretion. Note that if the"},{"line_number":484,"context_line":"config file update is in the same commit as the developer may have to resolve"},{"line_number":485,"context_line":"merge conflicts more often."},{"line_number":486,"context_line":""},{"line_number":487,"context_line":"To generate a new sample configuration to be included in a commit run:"}],"source_content_type":"text/x-rst","patch_set":3,"id":"fa32b979_eff6a28f","line":484,"in_reply_to":"fa32b979_4ed9f021","updated":"2015-06-26 16:18:23.000000000","message":"for me it\u0027s unclear too, may be you\u0027ve just missed something: \"...in the same commit as the sample file update the developer...\"","commit_id":"832bb51c06f58cff9a63b5aea00600f459f5f99f"},{"author":{"_account_id":8119,"name":"Eric Brown","email":"eric_wade_brown@yahoo.com","username":"ericwb"},"change_message_id":"e2bb6aaf856379b3f7e991d0f1e8ba16e16a7d4f","unresolved":false,"context_lines":[{"line_number":484,"context_line":"config file update is in the same commit as the developer may have to resolve"},{"line_number":485,"context_line":"merge conflicts more often."},{"line_number":486,"context_line":""},{"line_number":487,"context_line":"To generate a new sample configuration to be included in a commit run:"},{"line_number":488,"context_line":""},{"line_number":489,"context_line":".. code-block:: bash"},{"line_number":490,"context_line":""}],"source_content_type":"text/x-rst","patch_set":3,"id":"fa32b979_412ae9e8","line":487,"updated":"2015-06-27 15:10:13.000000000","message":"...commit, run:","commit_id":"832bb51c06f58cff9a63b5aea00600f459f5f99f"},{"author":{"_account_id":6486,"name":"Brant Knudson","email":"blk@acm.org","username":"blk-u"},"change_message_id":"b74f351c9a6c77270f0e72ed8fe6e13d01284da1","unresolved":false,"context_lines":[{"line_number":484,"context_line":"config file update is in the same commit as the developer may have to resolve"},{"line_number":485,"context_line":"merge conflicts more often."},{"line_number":486,"context_line":""},{"line_number":487,"context_line":"To generate a new sample configuration to be included in a commit run:"},{"line_number":488,"context_line":""},{"line_number":489,"context_line":".. code-block:: bash"},{"line_number":490,"context_line":""}],"source_content_type":"text/x-rst","patch_set":3,"id":"fa32b979_ae9dd90b","line":487,"in_reply_to":"fa32b979_412ae9e8","updated":"2015-06-28 15:59:16.000000000","message":"Done ... not sure why the comma is required here.","commit_id":"832bb51c06f58cff9a63b5aea00600f459f5f99f"},{"author":{"_account_id":5707,"name":"Henry Nash","email":"henryn@linux.vnet.ibm.com","username":"henry-nash"},"change_message_id":"f5f0e19298b3b5e1e731dd1f7572600e7e044f4c","unresolved":false,"context_lines":[{"line_number":482,"context_line":"generated. This can be done either in the commit that changes the config"},{"line_number":483,"context_line":"options or in a separate commit at the developer\u0027s discretion. Note that if the"},{"line_number":484,"context_line":"config file update is in the same commit, the developer may have to resolve"},{"line_number":485,"context_line":"merge conflicts more often."},{"line_number":486,"context_line":""},{"line_number":487,"context_line":"To generate a new sample configuration to be included in a commit, run:"},{"line_number":488,"context_line":""}],"source_content_type":"text/x-rst","patch_set":4,"id":"ba3cc151_80cbf952","line":485,"updated":"2015-06-30 18:47:53.000000000","message":"I\u0027d argue that we should just say it should be in the same commit.","commit_id":"b0d0f3655bec43ffe2ed85d95c85e0ee89be4fe1"}]}