Hi Dirk, We had considered pros and cons before voting and in my opinion using git submodules did not address the issue of fragmentation of focus and developer workflow (two repos to manage, maintain and ensure their PRs get in for a feature/enhancement/bugfix at the same time).
Regards. ________________________________ From: Klahre, Dirk <dirk.kla...@itelligence.de> Sent: Wednesday, January 20, 2021 14:56 To: dev@cloudstack.apache.org <dev@cloudstack.apache.org>; priv...@cloudstack.apache.org <priv...@cloudstack.apache.org> Subject: RE: [VOTE] Merge apache/cloudstack-primate with apache/cloudstack Hi Rohit, regarding the merge. It is possible to use the git submodule feature to include apache/cloudstack-primate into apache/cloudstack. In my last projects it works good and you keep the independence of the two repos. Best Regards Dirk Dirk Klahre Cloud Stack Developer - Cloud Management Platform GMS Cloud Infrastructure Services We Transform. Trust into Value itelligence Global Managed Services GmbH ▪ Breitscheidstrasse 48 ▪ 01237 Dresden phone: +49 3591 5253-1562 ▪ e-mail: dirk.kla...@itelligence.de www.itelligencegroup.com<http://www.itelligencegroup.com> Wir halten Sie immer auf dem Laufenden! Folgen Sie uns auf unseren Social Media Kanälen: Xing LinkedIn Facebook Twitter Profitieren Sie vom Know-how unserer Experten – mit dem itelligence Infoservice! Jetzt kostenlos registrieren! itelligence Global Managed Services GmbH ▪ Sitz: Bautzen ▪ Handelsregister: Amtsgericht Dresden, HRB 21356 Geschäftsführer: Mirko Kruse ▪ André Walter rohit.ya...@shapeblue.com www.shapeblue.com 3 London Bridge Street, 3rd floor, News Building, London SE1 9SGUK @shapeblue -----Original Message----- From: Rohit Yadav <rohit.ya...@shapeblue.com> Sent: Dienstag, 19. Januar 2021 15:43 To: dev@cloudstack.apache.org; priv...@cloudstack.apache.org Subject: Re: [VOTE] Merge apache/cloudstack-primate with apache/cloudstack EXTERNAL MAIL: Dear All, I've tried to review and merge as many apache/cloudstack-primate PRs as possible but there are still 16 of them open or in draft. Since the thread has not received any objections, I'll merge the UI codebase from apache/cloudstack-primate to apache/cloudstack (4.15 branch under UI directory) tomorrow (by eod 20 Jan 2021). On the logistics of doing the merge, I've tried to merge it under the ui/ directory of apache/cloudstack (4.15 branch) by trying to keep git history which does not work smoothly (and git log --follow ui/ does not work, even though I see all commits from the source repository). I'm trying to get this right but worst case I'll add source files and as a courtesy include all contributors from apache/cloudstack-primate as co-authors in the commit (https://docs.github.com/en/github/committing-changes-to-your-project/creating-a-commit-with-multiple-authors). I'll request and close all the open PRs that couldn't be merged to be re-opened for 4.15 or master branch under apache/cloudstack repo. After this I'll request ASF infra to archive that repository (make it read-only). Any feedback and comments are welcome. Regards. ________________________________ From: Rohit Yadav <rohit.ya...@shapeblue.com> Sent: Tuesday, January 12, 2021 16:27 To: dev@cloudstack.apache.org <dev@cloudstack.apache.org>; priv...@cloudstack.apache.org <priv...@cloudstack.apache.org> Subject: Re: [VOTE] Merge apache/cloudstack-primate with apache/cloudstack All, I've reviewed the current state of https://github.com/apache/cloudstack-primate/pulls which has several open PRs and issues and new PRs being opened every other day. This will cause some pain during the transition phase, I'll spend some time this week and next to get some of the open PRs merge and I request others to collaborate in testing/reviewing and merging of those open PRs. If it's reasonable, let's target to merge the repo into apache/cloudstack on/after 20 Jan (Wed next week) and then request ASF infra to archive the repository. Any thoughts, feedback? Thanks. ________________________________ From: Rohit Yadav <rohit.ya...@shapeblue.com> Sent: Friday, January 8, 2021 16:45 To: dev@cloudstack.apache.org <dev@cloudstack.apache.org>; priv...@cloudstack.apache.org <priv...@cloudstack.apache.org> Subject: Re: [VOTE] Merge apache/cloudstack-primate with apache/cloudstack All, I'll add my own +1 to this as well. With this, we've reached lazy consensus with 4 PMC votes (Pierre-Luc, Wei, Sven, Rohit) and 1 non-PMC vote (Hoang) with no objections on the proposal. After soon as 4.15.0.0 finishes voting and master is available to merges again , I'll work on the proposed steps: * Request ASF infra to archive the apache/cloudstack-primate (read-only) repository and remove all references to the name 'primate' * Move the UI code from apache/cloudstack-primate to apache/cloudstack's ui/ directory (old code has been already moved to ui/legacy directory already in latest master, which will be removed from master after 4.15 branch is cut) * Fix packaging to build to bundle the ui/ codebase using npm and mvn; developers will need to run it separately while working on a feature, enhancement, and bugfix * The cloudstack-management rpm/deb pkg will include built UI (at the current of /usr/share/cloudstack-management/webapps) and a new package cloudstack-ui will be added for advanced users who only want to install/use the UI (installed at a new path, for example, /usr/share/cloudstack-ui) Thanks all and regards. ________________________________ From: Rohit Yadav <rohit.ya...@shapeblue.com> Sent: Tuesday, December 29, 2020 14:26 To: dev@cloudstack.apache.org <dev@cloudstack.apache.org>; priv...@cloudstack.apache.org <priv...@cloudstack.apache.org> Subject: [VOTE] Merge apache/cloudstack-primate with apache/cloudstack Dear all, As discussed in a recent related thread and no objections were received on the proposal [1], I've started this voting thread on following: * Request ASF infra to archive the apache/cloudstack-primate (read-only) repository and remove all references to the name 'primate' * Move the UI code from apache/cloudstack-primate to apache/cloudstack's ui/ directory (old code has been already moved to ui/legacy directory already in latest master, which will be removed from master after 4.15 branch is cut) * Fix packaging to build to bundle the ui/ codebase using npm and mvn; developers will need to run it separately while working on a feature, enhancement, and bugfix * The cloudstack-management rpm/deb pkg will include built UI (at the current of /usr/share/cloudstack-management/webapps) and a new package cloudstack-ui will be added for advanced users who only want to install/use the UI (installed at a new path, for example, /usr/share/cloudstack-ui) The vote will be open for 72 hours and then extended until lazy consensus (3 PMC +1 votes) is reached. For sanity in tallying the vote, can PMC members please be sure to indicate "(binding)" with their vote? [ ] +1 approve [ ] +0 no opinion [ ] -1 disapprove (and reason why) [1] https://markmail.org/message/mdgeahlabpbx3v22 Regards. rohit.ya...@shapeblue.com www.shapeblue.com<http://www.shapeblue.com> 3 London Bridge Street, 3rd floor, News Building, London SE1 9SGUK @shapeblue rohit.ya...@shapeblue.com www.shapeblue.com<http://www.shapeblue.com> 3 London Bridge Street, 3rd floor, News Building, London SE1 9SGUK @shapeblue rohit.ya...@shapeblue.com www.shapeblue.com<http://www.shapeblue.com> 3 London Bridge Street, 3rd floor, News Building, London SE1 9SGUK @shapeblue rohit.ya...@shapeblue.com www.shapeblue.com<http://www.shapeblue.com> 3 London Bridge Street, 3rd floor, News Building, London SE1 9SGUK @shapeblue
