Re: [openstack-dev] [infra][mogan] Need help for replacing the current master
Many thanks to Jeremy and Clark. We are back on our feet for Mogan. Thanks, Dims On Fri, Oct 6, 2017 at 1:03 PM, Jeremy Stanleywrote: > On 2017-09-29 00:19:25 -0400 (-0400), Davanum Srinivas wrote: >> I tried several things, not sure i have enough git-fu to pull this >> off. For example. > [...] >> remote: ERROR: In commit de26dc69aa28f57512326227a65dc3f9110a7be1 >> remote: ERROR: committer email address sleepsonthefl...@gmail.com >> remote: ERROR: does not match your user account. > [...] > > Yep, sorry about that (and sorry we've been too distracted to > respond before now, thanks for the reminder in IRC). We should have > predicted you'd need forgeCommitter in addition to pushMerge. We've > added that via https://review.openstack.org/510158 which has now > applied in Gerrit so please do try again and I'll try to be more > responsive in assisting with any further errors (but hopefully it'll > "just work" now). > -- > Jeremy Stanley > > __ > OpenStack Development Mailing List (not for usage questions) > Unsubscribe: openstack-dev-requ...@lists.openstack.org?subject:unsubscribe > http://lists.openstack.org/cgi-bin/mailman/listinfo/openstack-dev > -- Davanum Srinivas :: https://twitter.com/dims __ OpenStack Development Mailing List (not for usage questions) Unsubscribe: openstack-dev-requ...@lists.openstack.org?subject:unsubscribe http://lists.openstack.org/cgi-bin/mailman/listinfo/openstack-dev
Re: [openstack-dev] [infra][mogan] Need help for replacing the current master
On 2017-09-29 00:19:25 -0400 (-0400), Davanum Srinivas wrote: > I tried several things, not sure i have enough git-fu to pull this > off. For example. [...] > remote: ERROR: In commit de26dc69aa28f57512326227a65dc3f9110a7be1 > remote: ERROR: committer email address sleepsonthefl...@gmail.com > remote: ERROR: does not match your user account. [...] Yep, sorry about that (and sorry we've been too distracted to respond before now, thanks for the reminder in IRC). We should have predicted you'd need forgeCommitter in addition to pushMerge. We've added that via https://review.openstack.org/510158 which has now applied in Gerrit so please do try again and I'll try to be more responsive in assisting with any further errors (but hopefully it'll "just work" now). -- Jeremy Stanley signature.asc Description: Digital signature __ OpenStack Development Mailing List (not for usage questions) Unsubscribe: openstack-dev-requ...@lists.openstack.org?subject:unsubscribe http://lists.openstack.org/cgi-bin/mailman/listinfo/openstack-dev
Re: [openstack-dev] [infra][mogan] Need help for replacing the current master
Jeremy, Clark, I tried several things, not sure i have enough git-fu to pull this off. For example. [dims@dims-mac 00:03] ~/openstack/openstack/mogan ⟩ git push gerrit HEAD:refs/for/master Counting objects: 8104, done. Delta compression using up to 4 threads. Compressing objects: 100% (2350/2350), done. Writing objects: 100% (8104/8104), 1.19 MiB | 0 bytes/s, done. Total 8104 (delta 2634), reused 8103 (delta 2634) remote: Resolving deltas: 100% (2634/2634) remote: Processing changes: refs: 1, done remote: remote: ERROR: In commit de26dc69aa28f57512326227a65dc3f9110a7be1 remote: ERROR: committer email address sleepsonthefl...@gmail.com remote: ERROR: does not match your user account. remote: ERROR: remote: ERROR: The following addresses are currently registered: remote: ERROR:dava...@gmail.com remote: ERROR:d...@huawei.com remote: ERROR: remote: ERROR: To register an email address, please visit: remote: ERROR: https://review.openstack.org/#/settings/contact remote: remote: To ssh://review.openstack.org:29418/openstack/mogan.git ! [remote rejected] HEAD -> refs/for/master (invalid committer) error: failed to push some refs to 'ssh://dim...@review.openstack.org:29418/openstack/mogan.git' Would it be simpler for you to do this for mogan team? Thanks, Dims PS: i did get added to mogan-core to try this experiment On Thu, Sep 28, 2017 at 9:09 AM, Davanum Srinivaswrote: > Jeremy, Clark, > > Filed a change :) > https://review.openstack.org/508151 > > Thanks, > Dims > > On Thu, Sep 28, 2017 at 8:55 AM, Jeremy Stanley wrote: >> On 2017-09-27 20:02:25 -0400 (-0400), Davanum Srinivas wrote: >>> I'd like to avoid the ACL update which will make it different from >>> other projects. Since we don't expect to do this again, can you please >>> help do this? >> [...] >> >> He (probably accidentally) left out the word "temporary." The ACL >> only needs to allow merge commits to be pushed long enough for that >> merge commit to get pushed for review, and then the ACL can be >> reverted to its earlier state. >> -- >> Jeremy Stanley >> >> __ >> OpenStack Development Mailing List (not for usage questions) >> Unsubscribe: openstack-dev-requ...@lists.openstack.org?subject:unsubscribe >> http://lists.openstack.org/cgi-bin/mailman/listinfo/openstack-dev >> > > > > -- > Davanum Srinivas :: https://twitter.com/dims -- Davanum Srinivas :: https://twitter.com/dims __ OpenStack Development Mailing List (not for usage questions) Unsubscribe: openstack-dev-requ...@lists.openstack.org?subject:unsubscribe http://lists.openstack.org/cgi-bin/mailman/listinfo/openstack-dev
Re: [openstack-dev] [infra][mogan] Need help for replacing the current master
Jeremy, Clark, Filed a change :) https://review.openstack.org/508151 Thanks, Dims On Thu, Sep 28, 2017 at 8:55 AM, Jeremy Stanleywrote: > On 2017-09-27 20:02:25 -0400 (-0400), Davanum Srinivas wrote: >> I'd like to avoid the ACL update which will make it different from >> other projects. Since we don't expect to do this again, can you please >> help do this? > [...] > > He (probably accidentally) left out the word "temporary." The ACL > only needs to allow merge commits to be pushed long enough for that > merge commit to get pushed for review, and then the ACL can be > reverted to its earlier state. > -- > Jeremy Stanley > > __ > OpenStack Development Mailing List (not for usage questions) > Unsubscribe: openstack-dev-requ...@lists.openstack.org?subject:unsubscribe > http://lists.openstack.org/cgi-bin/mailman/listinfo/openstack-dev > -- Davanum Srinivas :: https://twitter.com/dims __ OpenStack Development Mailing List (not for usage questions) Unsubscribe: openstack-dev-requ...@lists.openstack.org?subject:unsubscribe http://lists.openstack.org/cgi-bin/mailman/listinfo/openstack-dev
Re: [openstack-dev] [infra][mogan] Need help for replacing the current master
On 2017-09-27 20:02:25 -0400 (-0400), Davanum Srinivas wrote: > I'd like to avoid the ACL update which will make it different from > other projects. Since we don't expect to do this again, can you please > help do this? [...] He (probably accidentally) left out the word "temporary." The ACL only needs to allow merge commits to be pushed long enough for that merge commit to get pushed for review, and then the ACL can be reverted to its earlier state. -- Jeremy Stanley signature.asc Description: Digital signature __ OpenStack Development Mailing List (not for usage questions) Unsubscribe: openstack-dev-requ...@lists.openstack.org?subject:unsubscribe http://lists.openstack.org/cgi-bin/mailman/listinfo/openstack-dev
Re: [openstack-dev] [infra][mogan] Need help for replacing the current master
Clark, I'd like to avoid the ACL update which will make it different from other projects. Since we don't expect to do this again, can you please help do this? Thanks, Dims On Wed, Sep 27, 2017 at 7:55 PM, Clark Boylanwrote: > On Tue, Sep 26, 2017, at 05:57 PM, Zhenguo Niu wrote: >> Thanks Clark Boylan, >> >> We have frozen the Mogan repo since this mail sent out, and there's no >> need >> to update the replacement master. So please help out when you got time. > > I mentioned this to dims on IRC today, but should write it here as well > for broader reach. It looks like https://github.com/dims/mogan is a fast > forwardable change on top of 7744129c83839ab36801856f283fb165d71af32e. > Also its less than ten commits ahead of current mogan master (7744129). > For this reason I think you can just push those commits up to Gerrit and > review them normally. > > The only gotcha with this is you may need to update the Gerrit ACLs to > allow merge commit pushes. > > Clark > > __ > OpenStack Development Mailing List (not for usage questions) > Unsubscribe: openstack-dev-requ...@lists.openstack.org?subject:unsubscribe > http://lists.openstack.org/cgi-bin/mailman/listinfo/openstack-dev -- Davanum Srinivas :: https://twitter.com/dims __ OpenStack Development Mailing List (not for usage questions) Unsubscribe: openstack-dev-requ...@lists.openstack.org?subject:unsubscribe http://lists.openstack.org/cgi-bin/mailman/listinfo/openstack-dev
Re: [openstack-dev] [infra][mogan] Need help for replacing the current master
On Tue, Sep 26, 2017, at 05:57 PM, Zhenguo Niu wrote: > Thanks Clark Boylan, > > We have frozen the Mogan repo since this mail sent out, and there's no > need > to update the replacement master. So please help out when you got time. I mentioned this to dims on IRC today, but should write it here as well for broader reach. It looks like https://github.com/dims/mogan is a fast forwardable change on top of 7744129c83839ab36801856f283fb165d71af32e. Also its less than ten commits ahead of current mogan master (7744129). For this reason I think you can just push those commits up to Gerrit and review them normally. The only gotcha with this is you may need to update the Gerrit ACLs to allow merge commit pushes. Clark __ OpenStack Development Mailing List (not for usage questions) Unsubscribe: openstack-dev-requ...@lists.openstack.org?subject:unsubscribe http://lists.openstack.org/cgi-bin/mailman/listinfo/openstack-dev
Re: [openstack-dev] [infra][mogan] Need help for replacing the current master
Thanks Clark Boylan, We have frozen the Mogan repo since this mail sent out, and there's no need to update the replacement master. So please help out when you got time. On Wed, Sep 27, 2017 at 8:10 AM, Clark Boylanwrote: > On Tue, Sep 26, 2017, at 02:18 AM, Zhenguo Niu wrote: > > It's very appreciated if you shed some light on what the next steps would > > be to move this along. > > We should schedule a period of time to freeze the Mogan repo, update the > replacement master (if necessary) then we can either force push that > over the existing branch or push it into a new branch and have you > propose and then merge a merge commit. Considering that the purpose of > this is to better update the history of the master branch the force push > is likely the most appropriate option. Using a merge commit will result > in potentially complicated history which won't help with the objective > here. > > What is a good time to freeze, update and push? In total you probably > want to allocate a day to this, we can likely get by with less but it is > easy to block off a day and then we don't have to rush. > > Clark > > __ > OpenStack Development Mailing List (not for usage questions) > Unsubscribe: openstack-dev-requ...@lists.openstack.org?subject:unsubscribe > http://lists.openstack.org/cgi-bin/mailman/listinfo/openstack-dev > -- Best Regards, Zhenguo Niu __ OpenStack Development Mailing List (not for usage questions) Unsubscribe: openstack-dev-requ...@lists.openstack.org?subject:unsubscribe http://lists.openstack.org/cgi-bin/mailman/listinfo/openstack-dev
Re: [openstack-dev] [infra][mogan] Need help for replacing the current master
On Tue, Sep 26, 2017, at 02:18 AM, Zhenguo Niu wrote: > It's very appreciated if you shed some light on what the next steps would > be to move this along. We should schedule a period of time to freeze the Mogan repo, update the replacement master (if necessary) then we can either force push that over the existing branch or push it into a new branch and have you propose and then merge a merge commit. Considering that the purpose of this is to better update the history of the master branch the force push is likely the most appropriate option. Using a merge commit will result in potentially complicated history which won't help with the objective here. What is a good time to freeze, update and push? In total you probably want to allocate a day to this, we can likely get by with less but it is easy to block off a day and then we don't have to rush. Clark __ OpenStack Development Mailing List (not for usage questions) Unsubscribe: openstack-dev-requ...@lists.openstack.org?subject:unsubscribe http://lists.openstack.org/cgi-bin/mailman/listinfo/openstack-dev
Re: [openstack-dev] [infra][mogan] Need help for replacing the current master
It's very appreciated if you shed some light on what the next steps would be to move this along. On Sat, Sep 23, 2017 at 10:03 AM, Sheng Liuwrote: > Just confirmed the git history and compared the code with current Mogan > master, it is OK!, Thanks a lot for dims to help that. we will very > appreciate that Infra team can help us to replace the current Mogan master. > > -- > Best Regards > liusheng > > 2017-09-22 21:53 GMT+08:00 Zhenguo Niu : > >> Hi infra, >> >> In order to show respect to the original authors, we would like to >> replace the current mogan master [1] with a new forked repo [2] which >> includes the history of files which copied from other projects. >> >> The detailed discussion is here: http://lists.openstack.o >> rg/pipermail/openstack-dev/2017-September/122470.html >> >> Thank you for your time! >> >> [1] https://github.com/openstack/mogan >> [2] https://github.com/dims/mogan >> >> -- >> Best Regards, >> Zhenguo Niu >> >> >> __ >> OpenStack Development Mailing List (not for usage questions) >> Unsubscribe: openstack-dev-requ...@lists.openstack.org?subject:unsubscrib >> e >> http://lists.openstack.org/cgi-bin/mailman/listinfo/openstack-dev >> >> > > __ > OpenStack Development Mailing List (not for usage questions) > Unsubscribe: openstack-dev-requ...@lists.openstack.org?subject:unsubscribe > http://lists.openstack.org/cgi-bin/mailman/listinfo/openstack-dev > > -- Best Regards, Zhenguo Niu __ OpenStack Development Mailing List (not for usage questions) Unsubscribe: openstack-dev-requ...@lists.openstack.org?subject:unsubscribe http://lists.openstack.org/cgi-bin/mailman/listinfo/openstack-dev
Re: [openstack-dev] [infra][mogan] Need help for replacing the current master
Just confirmed the git history and compared the code with current Mogan master, it is OK!, Thanks a lot for dims to help that. we will very appreciate that Infra team can help us to replace the current Mogan master. -- Best Regards liusheng 2017-09-22 21:53 GMT+08:00 Zhenguo Niu: > Hi infra, > > In order to show respect to the original authors, we would like to replace > the current mogan master [1] with a new forked repo [2] which includes the > history of files which copied from other projects. > > The detailed discussion is here: http://lists.openstack.o > rg/pipermail/openstack-dev/2017-September/122470.html > > Thank you for your time! > > [1] https://github.com/openstack/mogan > [2] https://github.com/dims/mogan > > -- > Best Regards, > Zhenguo Niu > > __ > OpenStack Development Mailing List (not for usage questions) > Unsubscribe: openstack-dev-requ...@lists.openstack.org?subject:unsubscribe > http://lists.openstack.org/cgi-bin/mailman/listinfo/openstack-dev > > __ OpenStack Development Mailing List (not for usage questions) Unsubscribe: openstack-dev-requ...@lists.openstack.org?subject:unsubscribe http://lists.openstack.org/cgi-bin/mailman/listinfo/openstack-dev