)]}'
{"/COMMIT_MSG":[{"author":{"_account_id":8556,"name":"Ghanshyam Maan","display_name":"Ghanshyam Maan","email":"gmaan.os14@gmail.com","username":"ghanshyam"},"change_message_id":"06420293f1510d016cf436ee9e54435bf14df6da","unresolved":true,"context_lines":[{"line_number":7,"context_line":"Resolve to adhere to non-biased language"},{"line_number":8,"context_line":""},{"line_number":9,"context_line":"Add a resolution in support of the D\u0026I working"},{"line_number":10,"context_line":"group\u0027s recommendations. Clarify stance of the"},{"line_number":11,"context_line":"TC on the development branch naming."},{"line_number":12,"context_line":""},{"line_number":13,"context_line":"Change-Id: Ia5bf87bfa1fda277fa28677cc0f18d4627deb045"}],"source_content_type":"text/x-gerrit-commit-message","patch_set":2,"id":"ca452e1c_69792e24","line":11,"range":{"start_line":10,"start_character":25,"end_line":11,"end_character":36},"updated":"2024-11-13 03:34:01.000000000","message":"I do not think we discussed it in detail in TC yet. We did not have any TC discussion in PTG also. If you have strong opinion on changing current branch naming policy I will suggest let\u0027s discuss it in TC first.","commit_id":"7b363e9cacc7fb6337ef09772f5e3a9b8d8588ac"},{"author":{"_account_id":8556,"name":"Ghanshyam Maan","display_name":"Ghanshyam Maan","email":"gmaan.os14@gmail.com","username":"ghanshyam"},"change_message_id":"c33c4e51e73eda79911d70bf3c0a29a99f69e0e5","unresolved":true,"context_lines":[{"line_number":7,"context_line":"Resolve to adhere to non-biased language"},{"line_number":8,"context_line":""},{"line_number":9,"context_line":"Add a resolution in support of the D\u0026I working"},{"line_number":10,"context_line":"group\u0027s recommendations. Clarify stance of the"},{"line_number":11,"context_line":"TC on the development branch naming."},{"line_number":12,"context_line":""},{"line_number":13,"context_line":"Change-Id: Ia5bf87bfa1fda277fa28677cc0f18d4627deb045"}],"source_content_type":"text/x-gerrit-commit-message","patch_set":2,"id":"989cc4eb_c747f9d1","line":11,"range":{"start_line":10,"start_character":25,"end_line":11,"end_character":36},"in_reply_to":"4ae38509_1fba7377","updated":"2024-11-14 01:50:03.000000000","message":"ok I might have missed the discussion due to schedule or I thought we should have discuss about openstack specific task/discussion in TC rooms. Anyways, I might be missing but did not see any consensus in etherpad than what we already agreed and worked during 2021 on this.","commit_id":"7b363e9cacc7fb6337ef09772f5e3a9b8d8588ac"},{"author":{"_account_id":16643,"name":"Goutham Pacha Ravi","email":"gouthampravi@gmail.com","username":"gouthamr"},"change_message_id":"84898744b417b6c0922529504a32236a7618fc28","unresolved":true,"context_lines":[{"line_number":7,"context_line":"Resolve to adhere to non-biased language"},{"line_number":8,"context_line":""},{"line_number":9,"context_line":"Add a resolution in support of the D\u0026I working"},{"line_number":10,"context_line":"group\u0027s recommendations. Clarify stance of the"},{"line_number":11,"context_line":"TC on the development branch naming."},{"line_number":12,"context_line":""},{"line_number":13,"context_line":"Change-Id: Ia5bf87bfa1fda277fa28677cc0f18d4627deb045"}],"source_content_type":"text/x-gerrit-commit-message","patch_set":2,"id":"4ae38509_1fba7377","line":11,"range":{"start_line":10,"start_character":25,"end_line":11,"end_character":36},"in_reply_to":"5aa23c6c_c3825d5f","updated":"2024-11-13 21:30:45.000000000","message":"We discussed this at the PTG in conjunction with the D\u0026I group; there were several TC members in the room and we brainstormed together. there was general consensus for some actions:\n\n- we need to stop forcing the use of \"master\" for new repositories\n- we need to provide a guideline on what to use instead\n\nSo this resolution is an attempt at this.. All the places you mentioned are akin to this one, I don\u0027t see a problem with having a discussion here.. what are the downsides? We don\u0027t need a resolution for every decision, but, we got to write it down somewhere and pass it on.. \n\n\n[1] https://etherpad.opendev.org/p/oct2024-ptg-diversity-wg","commit_id":"7b363e9cacc7fb6337ef09772f5e3a9b8d8588ac"},{"author":{"_account_id":10342,"name":"Jay Faulkner","display_name":"JayF","email":"jay@jvf.cc","username":"JayF","status":"youtube.com/@oss-gr / podcast.gr-oss.io"},"change_message_id":"ee499527e7629bd12d93463f1c0751070bd7f3f0","unresolved":true,"context_lines":[{"line_number":7,"context_line":"Resolve to adhere to non-biased language"},{"line_number":8,"context_line":""},{"line_number":9,"context_line":"Add a resolution in support of the D\u0026I working"},{"line_number":10,"context_line":"group\u0027s recommendations. Clarify stance of the"},{"line_number":11,"context_line":"TC on the development branch naming."},{"line_number":12,"context_line":""},{"line_number":13,"context_line":"Change-Id: Ia5bf87bfa1fda277fa28677cc0f18d4627deb045"}],"source_content_type":"text/x-gerrit-commit-message","patch_set":2,"id":"fc2e1647_3e4bb13b","line":11,"range":{"start_line":10,"start_character":25,"end_line":11,"end_character":36},"in_reply_to":"ca452e1c_69792e24","updated":"2024-11-13 17:30:10.000000000","message":"Does this merge request and associated review feedback not count as TC discussion? These sort of things can often be better communicated about in writing IME.","commit_id":"7b363e9cacc7fb6337ef09772f5e3a9b8d8588ac"},{"author":{"_account_id":8556,"name":"Ghanshyam Maan","display_name":"Ghanshyam Maan","email":"gmaan.os14@gmail.com","username":"ghanshyam"},"change_message_id":"82935ea9390da99a0b452b79a57cbcbf9003a222","unresolved":true,"context_lines":[{"line_number":7,"context_line":"Resolve to adhere to non-biased language"},{"line_number":8,"context_line":""},{"line_number":9,"context_line":"Add a resolution in support of the D\u0026I working"},{"line_number":10,"context_line":"group\u0027s recommendations. Clarify stance of the"},{"line_number":11,"context_line":"TC on the development branch naming."},{"line_number":12,"context_line":""},{"line_number":13,"context_line":"Change-Id: Ia5bf87bfa1fda277fa28677cc0f18d4627deb045"}],"source_content_type":"text/x-gerrit-commit-message","patch_set":2,"id":"5aa23c6c_c3825d5f","line":11,"range":{"start_line":10,"start_character":25,"end_line":11,"end_character":36},"in_reply_to":"fc2e1647_3e4bb13b","updated":"2024-11-13 18:53:55.000000000","message":"It is, but I do not think TC resolution is the any better communication compared to ML and PTG meetings. But nothing stops us from having a adhoc/pre-discussion in the TC channel, meetings, or ML with a wider audience where we can have a detailed discussion to know the pros and cons of deciding the next step, especially if it needs resolution or not. We do not need to write resolution for every decision and those can be a path to prepare policy.","commit_id":"7b363e9cacc7fb6337ef09772f5e3a9b8d8588ac"}],"/PATCHSET_LEVEL":[{"author":{"_account_id":8556,"name":"Ghanshyam Maan","display_name":"Ghanshyam Maan","email":"gmaan.os14@gmail.com","username":"ghanshyam"},"change_message_id":"06420293f1510d016cf436ee9e54435bf14df6da","unresolved":false,"context_lines":[],"source_content_type":"","patch_set":2,"id":"275964e4_d0960680","updated":"2024-11-13 03:34:01.000000000","message":"Honestly saying, I am not sure what exactly we are recommending in this resolution and do we need resolution or not?\n\nThis talks about two things:\n\n1. \u0027D\u0026I working group recommendation\u0027 - I think this was discussed and worked a lot in past. We all agree on the recommendation and we have changed a lot of places to adopt the suggestion. But I am not sure why we need TC resolution at this time and just to say that \u0027we are ok with these recommendations\u0027. I think D\u0026I working group recommendation[1] is enough here for any Open Infra project to start the effort. If WG think any OpenInfra project is not changing the critical things/lang and those are causing serious issue then I would like to discuss it at board level and maybe we can state those in OpenInfra project confirmation guidelines[2]\n\n2. \u0027OpenStack default branch name change\u0027 - This discussion started when charms project started the \u0027main\u0027 as default branch[3]. If we are not ready to change the \u0027master\u0027 as default branch name (which is the current situation) then we do not need any resolution to state that. If we are recommending the new name to new project branch name then my recommendation is to first discuss it in TC and then we can see if it needs resolution or just update the new project requirement[4].\n\n[1] https://wiki.openstack.org/wiki/Diversity/Inclusivity\n[2] https://board.openinfra.dev/en/ProjectGuidelines\n[3] https://review.opendev.org/c/openstack/governance/+/903490\n[4] https://governance.openstack.org/tc/reference/new-projects-requirements.html","commit_id":"7b363e9cacc7fb6337ef09772f5e3a9b8d8588ac"},{"author":{"_account_id":16643,"name":"Goutham Pacha Ravi","email":"gouthampravi@gmail.com","username":"gouthamr"},"change_message_id":"84898744b417b6c0922529504a32236a7618fc28","unresolved":false,"context_lines":[],"source_content_type":"","patch_set":2,"id":"8673e711_34fd3978","updated":"2024-11-13 21:30:45.000000000","message":"Thank you all for your comments; before I push up some changes.. here are some responses.\n\n\n@fungi said:\n\n\u003e I\u0027ll point out that there\u0027s no guarantee the Git community will ever decide to change their built-in default branch name to something other than \"master\" (that effort seemed to die off years ago when the people who were pushing for it moved on to other concerns). As a result, the OpenDev Collaboratory may also not end up changing their default branch name for new projects created without an explicit override.\n\nAck, there\u0027s no reliance on the git community and their direction; Most OpenStack software is usually born elsewhere (GitHub, GitLab, BitBucket.. ) and even on peoples\u0027 computers, there\u0027s a preference to override the default branch name. So I see this in new repositories.. I\u0027d like to ensure we\u0027re not forcing people\u0027s beliefs and being dismissive of their preferences with unstated rules.\n\n\n\u003e OpenStack can decide to set standards for what default branch name its projects use, but it\u0027s unclear to me why that\u0027s the primary takeaway from the D\u0026I WG recommendations when we actually did our best to downplay its relative level of concern compared to other terms and phrases that would be far more effective to replace with much less disruption to the overall developer workflow.\n\nThis isn\u0027t the primary takeaway. Is this worded like it is? I want to echo what you said about following https://wiki.openstack.org/wiki/Diversity/Inclusivity. I can add this link to the resolution (was a bit unsure about including a wiki link originally because, you know, wikis can be edited :) )","commit_id":"7b363e9cacc7fb6337ef09772f5e3a9b8d8588ac"},{"author":{"_account_id":8556,"name":"Ghanshyam Maan","display_name":"Ghanshyam Maan","email":"gmaan.os14@gmail.com","username":"ghanshyam"},"change_message_id":"c33c4e51e73eda79911d70bf3c0a29a99f69e0e5","unresolved":false,"context_lines":[],"source_content_type":"","patch_set":2,"id":"4ac3e90c_a869e993","in_reply_to":"18be8374_2d099514","updated":"2024-11-14 01:50:03.000000000","message":"I commented inline in detail. Let\u0027s discuss and propose that \u0027we\u0027re okay with the default branch to be called \"main. \"I cannot talk on behalf of another TC, but I am not okay with the two-name recommendation, which creates inconsistency. My suggestion is let\u0027s keep this resolution to discuss what are the plan for OpenStack default branch name?","commit_id":"7b363e9cacc7fb6337ef09772f5e3a9b8d8588ac"},{"author":{"_account_id":16643,"name":"Goutham Pacha Ravi","email":"gouthampravi@gmail.com","username":"gouthamr"},"change_message_id":"84898744b417b6c0922529504a32236a7618fc28","unresolved":false,"context_lines":[],"source_content_type":"","patch_set":2,"id":"18be8374_2d099514","in_reply_to":"275964e4_d0960680","updated":"2024-11-13 21:30:45.000000000","message":"\u003e But I am not sure why we need TC resolution at this time and just to say that \u0027we are ok with these recommendations\u0027.\n\nHmm, the D\u0026I working group recommendations come alongside this statement from the OpenInfra Board (linked in [1] from your references): https://wiki.openstack.org/wiki/Governance/Foundation/Inclusive_Language\n\nThis states:\n\n\"These efforts are the responsibility of the various technical leadership groups within our communities, and we trust them to make appropriate decisions about applicability, timelines, minimizing impact to users and operators, and choosing the changes that make the most sense for their projects.\"\n\n\nSo, I\u0027m taking the opportunity through this resolution, like we discussed at the PTG, to formalize our effort. We\u0027ll resolve to follow the recommendation in https://wiki.openstack.org/wiki/Diversity/Inclusivity. \n\n\u003e \u0027OpenStack default branch name change\u0027\n\nA change isn\u0027t being recommended in this resolution. But the rest of your statement is correct: Since we there was no formal requirement for \"master\" to be the default branch name, and since this issue came up during recent reviews, I\u0027m proposing we take a stance and formalize that we\u0027re okay with the default branch to be called \"main\".","commit_id":"7b363e9cacc7fb6337ef09772f5e3a9b8d8588ac"}],"resolutions/20241111-inclusive-language-statement.rst":[{"author":{"_account_id":10342,"name":"Jay Faulkner","display_name":"JayF","email":"jay@jvf.cc","username":"JayF","status":"youtube.com/@oss-gr / podcast.gr-oss.io"},"change_message_id":"ba66d77fc9e0be6afd65a2c799c1d86b339c7cb7","unresolved":true,"context_lines":[{"line_number":23,"context_line":""},{"line_number":24,"context_line":"In particular, the use of the word \"master\" to denote the git branch that is the"},{"line_number":25,"context_line":"focus of development during an OpenStack coordinated release cycle has been called"},{"line_number":26,"context_line":"out to be problematic. We are unwilling to take a stance on context, and would like"},{"line_number":27,"context_line":"to acknowledge that we will accept project teams to have a custom name for their"},{"line_number":28,"context_line":"development branch. We recommend limiting the name choices where possible by"},{"line_number":29,"context_line":"using \"main\" as the alternative so that cross-project tooling, scripting and test"}],"source_content_type":"text/x-rst","patch_set":1,"id":"96a79514_8ca823f1","line":26,"updated":"2024-11-12 22:32:54.000000000","message":"I don\u0027t know what you mean by \"we are unwilling to take a stance on context\" -- it sounds kinda like defending use of the branch name which I don\u0027t think is your intent.","commit_id":"691fccb45bf33d48b38cdbaef97a2103c320b56f"},{"author":{"_account_id":4146,"name":"Clark Boylan","email":"cboylan@sapwetik.org","username":"cboylan"},"change_message_id":"1c0ef65b4fa3f43f886febf3e1d1e2c20936b5d0","unresolved":true,"context_lines":[{"line_number":23,"context_line":""},{"line_number":24,"context_line":"In particular, the use of the word \"master\" to denote the git branch that is the"},{"line_number":25,"context_line":"focus of development during an OpenStack coordinated release cycle has been called"},{"line_number":26,"context_line":"out to be problematic. We are unwilling to take a stance on context, and would like"},{"line_number":27,"context_line":"to acknowledge that we will accept project teams to have a custom name for their"},{"line_number":28,"context_line":"development branch. We recommend limiting the name choices where possible by"},{"line_number":29,"context_line":"using \"main\" as the alternative so that cross-project tooling, scripting and test"}],"source_content_type":"text/x-rst","patch_set":1,"id":"7aad92cf_8c96efe5","line":26,"in_reply_to":"96a79514_8ca823f1","updated":"2024-11-12 22:53:02.000000000","message":"I read it as saying we won\u0027t take a stance on \"master\" being ok depending on context. Instead the word is problematic in some context(s) therefore openstack will just avoid it entirely.","commit_id":"691fccb45bf33d48b38cdbaef97a2103c320b56f"},{"author":{"_account_id":16643,"name":"Goutham Pacha Ravi","email":"gouthampravi@gmail.com","username":"gouthamr"},"change_message_id":"84898744b417b6c0922529504a32236a7618fc28","unresolved":true,"context_lines":[{"line_number":23,"context_line":""},{"line_number":24,"context_line":"In particular, the use of the word \"master\" to denote the git branch that is the"},{"line_number":25,"context_line":"focus of development during an OpenStack coordinated release cycle has been called"},{"line_number":26,"context_line":"out to be problematic. We are unwilling to take a stance on context, and would like"},{"line_number":27,"context_line":"to acknowledge that we will accept project teams to have a custom name for their"},{"line_number":28,"context_line":"development branch. We recommend limiting the name choices where possible by"},{"line_number":29,"context_line":"using \"main\" as the alternative so that cross-project tooling, scripting and test"}],"source_content_type":"text/x-rst","patch_set":1,"id":"fc6faf37_1de33264","line":26,"in_reply_to":"96a79514_8ca823f1","updated":"2024-11-13 21:30:45.000000000","message":"yes; what clark said\nJay: I can reword this; can you please add your -1 back; my formatting fix removed it.","commit_id":"691fccb45bf33d48b38cdbaef97a2103c320b56f"},{"author":{"_account_id":10342,"name":"Jay Faulkner","display_name":"JayF","email":"jay@jvf.cc","username":"JayF","status":"youtube.com/@oss-gr / podcast.gr-oss.io"},"change_message_id":"ba66d77fc9e0be6afd65a2c799c1d86b339c7cb7","unresolved":true,"context_lines":[{"line_number":29,"context_line":"using \"main\" as the alternative so that cross-project tooling, scripting and test"},{"line_number":30,"context_line":"integration efforts can standardize over this consistency. We do not require"},{"line_number":31,"context_line":"renaming the development branch of existing projects and repositories within the"},{"line_number":32,"context_line":"`openstack/` namespace on opendev.org. This effort may be considered in the future."},{"line_number":33,"context_line":""},{"line_number":34,"context_line":".. _Diversity and Inclusion Working Group: https://openinfra.dev/about/diversity"},{"line_number":35,"context_line":".. _Community Code of Conduct: https://openinfra.dev/legal/code-of-conduct"}],"source_content_type":"text/x-rst","patch_set":1,"id":"92610a2e_a357e12a","line":32,"updated":"2024-11-12 22:32:54.000000000","message":"IMO we should state definitively what the new default branch name is for incoming/new OpenStack projects (main, I\u0027d assume?) even if the policy is they can choose whatever they want that isn\u0027t problematic.","commit_id":"691fccb45bf33d48b38cdbaef97a2103c320b56f"},{"author":{"_account_id":16643,"name":"Goutham Pacha Ravi","email":"gouthampravi@gmail.com","username":"gouthamr"},"change_message_id":"84898744b417b6c0922529504a32236a7618fc28","unresolved":true,"context_lines":[{"line_number":29,"context_line":"using \"main\" as the alternative so that cross-project tooling, scripting and test"},{"line_number":30,"context_line":"integration efforts can standardize over this consistency. We do not require"},{"line_number":31,"context_line":"renaming the development branch of existing projects and repositories within the"},{"line_number":32,"context_line":"`openstack/` namespace on opendev.org. This effort may be considered in the future."},{"line_number":33,"context_line":""},{"line_number":34,"context_line":".. _Diversity and Inclusion Working Group: https://openinfra.dev/about/diversity"},{"line_number":35,"context_line":".. _Community Code of Conduct: https://openinfra.dev/legal/code-of-conduct"}],"source_content_type":"text/x-rst","patch_set":1,"id":"8326ec81_9894e504","line":32,"in_reply_to":"92610a2e_a357e12a","updated":"2024-11-13 21:30:45.000000000","message":"that\u0027s a neat idea.. i didn\u0027t think of _requiring_ new projects to use \"main\". I can definitely state that if that\u0027s a collective preference here.","commit_id":"691fccb45bf33d48b38cdbaef97a2103c320b56f"},{"author":{"_account_id":8556,"name":"Ghanshyam Maan","display_name":"Ghanshyam Maan","email":"gmaan.os14@gmail.com","username":"ghanshyam"},"change_message_id":"c33c4e51e73eda79911d70bf3c0a29a99f69e0e5","unresolved":true,"context_lines":[{"line_number":2,"context_line":"2024-11-11 Commitment to Non-Biased, Inclusive Language in OpenStack Community Artifacts"},{"line_number":3,"context_line":"\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d"},{"line_number":4,"context_line":""},{"line_number":5,"context_line":"The OpenStack Technical Committee strives to embody the spirit of diversity,"},{"line_number":6,"context_line":"equity and inclusion that has been the bedrock of the OpenStack community"},{"line_number":7,"context_line":"since its beginning. The community\u0027s spirit stems from its desire to empower"},{"line_number":8,"context_line":"individuals from all backgrounds to innovate and contribute to a more open"},{"line_number":9,"context_line":"and accessible cloud infrastructure. This has been incorporated in the"},{"line_number":10,"context_line":"`Community Code of Conduct`_."},{"line_number":11,"context_line":""},{"line_number":12,"context_line":"Language used within community-created artifacts must create an environment"},{"line_number":13,"context_line":"where all individuals feel included, respected, supported, and empowered to"},{"line_number":14,"context_line":"contribute. We must make every effort to avoid language with historical or"},{"line_number":15,"context_line":"cultural connotations that may alienate, marginalize, or exclude individuals."},{"line_number":16,"context_line":""},{"line_number":17,"context_line":"To this effect, we resolve that the Openstack Technical Committee will support"},{"line_number":18,"context_line":"the mission of the OpenInfra Foundation\u0027s"},{"line_number":19,"context_line":"`Diversity and Inclusion Working Group`_"},{"line_number":20,"context_line":"to incrementally correct problematic language in existing artifacts, including"},{"line_number":21,"context_line":"code and documentation. While making these corrections, we would like to"},{"line_number":22,"context_line":"minimize the"},{"line_number":23,"context_line":"impact on consumers of OpenStack (operators, users and contributors) by"},{"line_number":24,"context_line":"providing adequate time to migrate in case the deprecation, renaming or"},{"line_number":25,"context_line":"rewording of OpenStack software will affect backwards compatibility."},{"line_number":26,"context_line":""},{"line_number":27,"context_line":"In particular, the use of the word \"master\" to denote the git branch that is"},{"line_number":28,"context_line":"the focus of development during an OpenStack coordinated release cycle has"}],"source_content_type":"text/x-rst","patch_set":2,"id":"56d32a90_227d3afa","line":25,"range":{"start_line":5,"start_character":0,"end_line":25,"end_character":68},"updated":"2024-11-14 01:50:03.000000000","message":"My suggestion is to remove this part from resolution as we already agreed and worked on D\u0026I WG recommendation during 2021 and resolution of saying \u0027we are ok with the recommendation\u0027 is not needed as such.\n\nI will say let\u0027s move this (along with WG recommendation wiki page link) in the project team guide[1] and that can be referred by the project team and we can enhance that with more concrete examples or evolving document.\n\n[1] https://docs.openstack.org/project-team-guide/","commit_id":"7b363e9cacc7fb6337ef09772f5e3a9b8d8588ac"},{"author":{"_account_id":4146,"name":"Clark Boylan","email":"cboylan@sapwetik.org","username":"cboylan"},"change_message_id":"ec96120ef7bbae67e5e729aead49ca03575f79b5","unresolved":true,"context_lines":[{"line_number":28,"context_line":"the focus of development during an OpenStack coordinated release cycle has"},{"line_number":29,"context_line":"been called out to be problematic. We are unwilling to take a stance on"},{"line_number":30,"context_line":"context, and would like to acknowledge that we will accept project teams to"},{"line_number":31,"context_line":"have a custom name for their development branch. We recommend limiting the"},{"line_number":32,"context_line":"name choices where possible by using \"main\" as the alternative so that"},{"line_number":33,"context_line":"cross-project tooling, scripting and test integration efforts can"},{"line_number":34,"context_line":"standardize over this consistency. We do not require renaming the"}],"source_content_type":"text/x-rst","patch_set":2,"id":"5974ecf4_8888e9d0","line":31,"range":{"start_line":31,"start_character":7,"end_line":31,"end_character":18},"updated":"2024-11-12 22:34:30.000000000","message":"I feel like this opens the door to allowing every project to have a different primary development branch name. I would not do that. Every openstack project should use the same consistent alternative to master or master if migration hasn\u0027t been performed yet.\n\nI don\u0027t think the next sentence recommending \"main\" as the alternative is strong enough.","commit_id":"7b363e9cacc7fb6337ef09772f5e3a9b8d8588ac"},{"author":{"_account_id":28619,"name":"Dmitriy Rabotyagov","email":"noonedeadpunk@gmail.com","username":"noonedeadpunk"},"change_message_id":"114a77b0ae00a589ccb0c9fcdc5f5efa2f697f2c","unresolved":true,"context_lines":[{"line_number":28,"context_line":"the focus of development during an OpenStack coordinated release cycle has"},{"line_number":29,"context_line":"been called out to be problematic. We are unwilling to take a stance on"},{"line_number":30,"context_line":"context, and would like to acknowledge that we will accept project teams to"},{"line_number":31,"context_line":"have a custom name for their development branch. We recommend limiting the"},{"line_number":32,"context_line":"name choices where possible by using \"main\" as the alternative so that"},{"line_number":33,"context_line":"cross-project tooling, scripting and test integration efforts can"},{"line_number":34,"context_line":"standardize over this consistency. We do not require renaming the"}],"source_content_type":"text/x-rst","patch_set":2,"id":"a1ad8bb0_c6558f30","line":31,"range":{"start_line":31,"start_character":7,"end_line":31,"end_character":18},"in_reply_to":"3967c035_b8cc2051","updated":"2024-11-18 08:42:18.000000000","message":"+1 here, I accidentally posted my reply to other thread so check also below 😞","commit_id":"7b363e9cacc7fb6337ef09772f5e3a9b8d8588ac"},{"author":{"_account_id":8556,"name":"Ghanshyam Maan","display_name":"Ghanshyam Maan","email":"gmaan.os14@gmail.com","username":"ghanshyam"},"change_message_id":"06420293f1510d016cf436ee9e54435bf14df6da","unresolved":true,"context_lines":[{"line_number":28,"context_line":"the focus of development during an OpenStack coordinated release cycle has"},{"line_number":29,"context_line":"been called out to be problematic. We are unwilling to take a stance on"},{"line_number":30,"context_line":"context, and would like to acknowledge that we will accept project teams to"},{"line_number":31,"context_line":"have a custom name for their development branch. We recommend limiting the"},{"line_number":32,"context_line":"name choices where possible by using \"main\" as the alternative so that"},{"line_number":33,"context_line":"cross-project tooling, scripting and test integration efforts can"},{"line_number":34,"context_line":"standardize over this consistency. We do not require renaming the"}],"source_content_type":"text/x-rst","patch_set":2,"id":"f4e21fe4_12e4743f","line":31,"range":{"start_line":31,"start_character":7,"end_line":31,"end_character":18},"in_reply_to":"5974ecf4_8888e9d0","updated":"2024-11-13 03:34:01.000000000","message":"Agree, this can create more confusion and complexity to our process and tooling. TC should make an effort to keep consistency in all OpenStack projects instead of encouraging more inconsistency. NOTE our support tooling needs a bug update if we are asking projects to choose their custom branches. The biggest impact is testing tooling.\n\nI am ok to change our default branch and to any name but strongly against of inconsistent branch names within OpenStack. Every project must use the same branch name.","commit_id":"7b363e9cacc7fb6337ef09772f5e3a9b8d8588ac"},{"author":{"_account_id":8556,"name":"Ghanshyam Maan","display_name":"Ghanshyam Maan","email":"gmaan.os14@gmail.com","username":"ghanshyam"},"change_message_id":"c33c4e51e73eda79911d70bf3c0a29a99f69e0e5","unresolved":true,"context_lines":[{"line_number":28,"context_line":"the focus of development during an OpenStack coordinated release cycle has"},{"line_number":29,"context_line":"been called out to be problematic. We are unwilling to take a stance on"},{"line_number":30,"context_line":"context, and would like to acknowledge that we will accept project teams to"},{"line_number":31,"context_line":"have a custom name for their development branch. We recommend limiting the"},{"line_number":32,"context_line":"name choices where possible by using \"main\" as the alternative so that"},{"line_number":33,"context_line":"cross-project tooling, scripting and test integration efforts can"},{"line_number":34,"context_line":"standardize over this consistency. We do not require renaming the"}],"source_content_type":"text/x-rst","patch_set":2,"id":"3967c035_b8cc2051","line":31,"range":{"start_line":31,"start_character":7,"end_line":31,"end_character":18},"in_reply_to":"94e9ed88_653ae785","updated":"2024-11-14 01:50:03.000000000","message":"having two names among OpenStack is not *consistent*. I am strongly against of more than one branch name though I am not saying we continue using \u0027master\u0027 but if we are ok and have plan then let\u0027s change it to \u0027main\u0027 for all existing as well as new projects but please keep only single consistent naming.","commit_id":"7b363e9cacc7fb6337ef09772f5e3a9b8d8588ac"},{"author":{"_account_id":16643,"name":"Goutham Pacha Ravi","email":"gouthampravi@gmail.com","username":"gouthamr"},"change_message_id":"84898744b417b6c0922529504a32236a7618fc28","unresolved":true,"context_lines":[{"line_number":28,"context_line":"the focus of development during an OpenStack coordinated release cycle has"},{"line_number":29,"context_line":"been called out to be problematic. We are unwilling to take a stance on"},{"line_number":30,"context_line":"context, and would like to acknowledge that we will accept project teams to"},{"line_number":31,"context_line":"have a custom name for their development branch. We recommend limiting the"},{"line_number":32,"context_line":"name choices where possible by using \"main\" as the alternative so that"},{"line_number":33,"context_line":"cross-project tooling, scripting and test integration efforts can"},{"line_number":34,"context_line":"standardize over this consistency. We do not require renaming the"}],"source_content_type":"text/x-rst","patch_set":2,"id":"94e9ed88_653ae785","line":31,"range":{"start_line":31,"start_character":7,"end_line":31,"end_character":18},"in_reply_to":"f4e21fe4_12e4743f","updated":"2024-11-13 21:30:45.000000000","message":"Hmm, I can make the recommendation stronger. However, if we accept this resolution, the route is to live with two possibilities: \"master\" (all existing repositories) and \"main\" (new repositories). I\u0027m totally in support of this consistency..","commit_id":"7b363e9cacc7fb6337ef09772f5e3a9b8d8588ac"},{"author":{"_account_id":8556,"name":"Ghanshyam Maan","display_name":"Ghanshyam Maan","email":"gmaan.os14@gmail.com","username":"ghanshyam"},"change_message_id":"c33c4e51e73eda79911d70bf3c0a29a99f69e0e5","unresolved":true,"context_lines":[{"line_number":24,"context_line":"providing adequate time to migrate in case the deprecation, renaming or"},{"line_number":25,"context_line":"rewording of OpenStack software will affect backwards compatibility."},{"line_number":26,"context_line":""},{"line_number":27,"context_line":"In particular, the use of the word \"master\" to denote the git branch that is"},{"line_number":28,"context_line":"the focus of development during an OpenStack coordinated release cycle has"},{"line_number":29,"context_line":"been called out to be problematic. We are unwilling to take a stance on"},{"line_number":30,"context_line":"context, and would like to acknowledge that we will accept project teams to"},{"line_number":31,"context_line":"have a custom name for their development branch. We recommend limiting the"},{"line_number":32,"context_line":"name choices where possible by using \"main\" as the alternative so that"},{"line_number":33,"context_line":"cross-project tooling, scripting and test integration efforts can"},{"line_number":34,"context_line":"standardize over this consistency. We do not require renaming the"},{"line_number":35,"context_line":"development branch of existing projects and repositories within the"},{"line_number":36,"context_line":"`openstack/` namespace on opendev.org. This effort may be considered in the"},{"line_number":37,"context_line":"future."},{"line_number":38,"context_line":""},{"line_number":39,"context_line":".. _Diversity and Inclusion Working Group: https://openinfra.dev/about/diversity"},{"line_number":40,"context_line":".. _Community Code of Conduct: https://openinfra.dev/legal/code-of-conduct"}],"source_content_type":"text/x-rst","patch_set":2,"id":"8fbdf0c0_edd83026","line":37,"range":{"start_line":27,"start_character":0,"end_line":37,"end_character":7},"updated":"2024-11-14 01:50:03.000000000","message":"This proposal which is \u0027OpenStack projects default branch naming\u0027 can be proposed and discussed as a resolution because this has big impact and we should do it as a separate topic instead of mixing it in D\u0026I WG recommendation guidelines.  That way we will be able to discuss default branch name changing topic in productive way.","commit_id":"7b363e9cacc7fb6337ef09772f5e3a9b8d8588ac"},{"author":{"_account_id":7166,"name":"Sylvain Bauza","email":"sbauza@redhat.com","username":"sbauza"},"change_message_id":"e0ce6b7e5cb0c015b1f2e64bea39cc6bed288088","unresolved":true,"context_lines":[{"line_number":24,"context_line":"providing adequate time to migrate in case the deprecation, renaming or"},{"line_number":25,"context_line":"rewording of OpenStack software will affect backwards compatibility."},{"line_number":26,"context_line":""},{"line_number":27,"context_line":"In particular, the use of the word \"master\" to denote the git branch that is"},{"line_number":28,"context_line":"the focus of development during an OpenStack coordinated release cycle has"},{"line_number":29,"context_line":"been called out to be problematic. We are unwilling to take a stance on"},{"line_number":30,"context_line":"context, and would like to acknowledge that we will accept project teams to"},{"line_number":31,"context_line":"have a custom name for their development branch. We recommend limiting the"},{"line_number":32,"context_line":"name choices where possible by using \"main\" as the alternative so that"},{"line_number":33,"context_line":"cross-project tooling, scripting and test integration efforts can"},{"line_number":34,"context_line":"standardize over this consistency. We do not require renaming the"},{"line_number":35,"context_line":"development branch of existing projects and repositories within the"},{"line_number":36,"context_line":"`openstack/` namespace on opendev.org. This effort may be considered in the"},{"line_number":37,"context_line":"future."},{"line_number":38,"context_line":""},{"line_number":39,"context_line":".. _Diversity and Inclusion Working Group: https://openinfra.dev/about/diversity"},{"line_number":40,"context_line":".. _Community Code of Conduct: https://openinfra.dev/legal/code-of-conduct"}],"source_content_type":"text/x-rst","patch_set":2,"id":"886e35e6_c27dfdaa","line":37,"range":{"start_line":27,"start_character":0,"end_line":37,"end_character":7},"in_reply_to":"41525daf_010166f8","updated":"2025-02-04 18:28:59.000000000","message":"My main concern is that changing the existing (I tho understand the context) is difficult for each of the repositories we have. We need all the communities to be able to work on that and it would need to prioritized against other changes. 😞","commit_id":"7b363e9cacc7fb6337ef09772f5e3a9b8d8588ac"},{"author":{"_account_id":28619,"name":"Dmitriy Rabotyagov","email":"noonedeadpunk@gmail.com","username":"noonedeadpunk"},"change_message_id":"9ab365f34adf4b406f3c7786c7599ef989df8f35","unresolved":true,"context_lines":[{"line_number":24,"context_line":"providing adequate time to migrate in case the deprecation, renaming or"},{"line_number":25,"context_line":"rewording of OpenStack software will affect backwards compatibility."},{"line_number":26,"context_line":""},{"line_number":27,"context_line":"In particular, the use of the word \"master\" to denote the git branch that is"},{"line_number":28,"context_line":"the focus of development during an OpenStack coordinated release cycle has"},{"line_number":29,"context_line":"been called out to be problematic. We are unwilling to take a stance on"},{"line_number":30,"context_line":"context, and would like to acknowledge that we will accept project teams to"},{"line_number":31,"context_line":"have a custom name for their development branch. We recommend limiting the"},{"line_number":32,"context_line":"name choices where possible by using \"main\" as the alternative so that"},{"line_number":33,"context_line":"cross-project tooling, scripting and test integration efforts can"},{"line_number":34,"context_line":"standardize over this consistency. We do not require renaming the"},{"line_number":35,"context_line":"development branch of existing projects and repositories within the"},{"line_number":36,"context_line":"`openstack/` namespace on opendev.org. This effort may be considered in the"},{"line_number":37,"context_line":"future."},{"line_number":38,"context_line":""},{"line_number":39,"context_line":".. _Diversity and Inclusion Working Group: https://openinfra.dev/about/diversity"},{"line_number":40,"context_line":".. _Community Code of Conduct: https://openinfra.dev/legal/code-of-conduct"}],"source_content_type":"text/x-rst","patch_set":2,"id":"b6ed19f4_fd5ae6db","line":37,"range":{"start_line":27,"start_character":0,"end_line":37,"end_character":7},"in_reply_to":"8fbdf0c0_edd83026","updated":"2024-11-18 08:40:48.000000000","message":"from my experience so far having a mix of `main` and `master` in a cross-dependent libraries is a pita, as there are quite some places where we need to take into account and ensure they deal together nicely. Ie Zuul dependencies (including required-projects definitions), periodic tasks, release tooling, etc.\n\nso yeah keeping both naming conventions for new/old deliverables would require documentation on how to make these both work with our tooling.","commit_id":"7b363e9cacc7fb6337ef09772f5e3a9b8d8588ac"},{"author":{"_account_id":8556,"name":"Ghanshyam Maan","display_name":"Ghanshyam Maan","email":"gmaan.os14@gmail.com","username":"ghanshyam"},"change_message_id":"b689e5db42e64b886f76d57f3bd5b66128cde67f","unresolved":true,"context_lines":[{"line_number":24,"context_line":"providing adequate time to migrate in case the deprecation, renaming or"},{"line_number":25,"context_line":"rewording of OpenStack software will affect backwards compatibility."},{"line_number":26,"context_line":""},{"line_number":27,"context_line":"In particular, the use of the word \"master\" to denote the git branch that is"},{"line_number":28,"context_line":"the focus of development during an OpenStack coordinated release cycle has"},{"line_number":29,"context_line":"been called out to be problematic. We are unwilling to take a stance on"},{"line_number":30,"context_line":"context, and would like to acknowledge that we will accept project teams to"},{"line_number":31,"context_line":"have a custom name for their development branch. We recommend limiting the"},{"line_number":32,"context_line":"name choices where possible by using \"main\" as the alternative so that"},{"line_number":33,"context_line":"cross-project tooling, scripting and test integration efforts can"},{"line_number":34,"context_line":"standardize over this consistency. We do not require renaming the"},{"line_number":35,"context_line":"development branch of existing projects and repositories within the"},{"line_number":36,"context_line":"`openstack/` namespace on opendev.org. This effort may be considered in the"},{"line_number":37,"context_line":"future."},{"line_number":38,"context_line":""},{"line_number":39,"context_line":".. _Diversity and Inclusion Working Group: https://openinfra.dev/about/diversity"},{"line_number":40,"context_line":".. _Community Code of Conduct: https://openinfra.dev/legal/code-of-conduct"}],"source_content_type":"text/x-rst","patch_set":2,"id":"41525daf_010166f8","line":37,"range":{"start_line":27,"start_character":0,"end_line":37,"end_character":7},"in_reply_to":"b6ed19f4_fd5ae6db","updated":"2024-11-18 17:54:11.000000000","message":"true, and also the effort planning to fix all those places/tooling.","commit_id":"7b363e9cacc7fb6337ef09772f5e3a9b8d8588ac"}]}