Hi All, We can create a tempory branch out from the master in Carbon Kernel [1] <https://github.com/wso2/carbon-kernel>, merge Lakshman's PR to that branch and then move it to the Carbon SecVault [2] <https://github.com/wso2/carbon-secvault> (not the master branch - we need to create another new branch here). This way we can we can preserve the commit history. I will create my pull request to the new branch in Carbon Sec Vault.
[1] Carbon Kernel <https://github.com/wso2/carbon-kernel> [2] Carbon Secure Vault <https://github.com/wso2/carbon-secvault> On Fri, Mar 10, 2017 at 7:11 PM, Niranjan Karunanandham <[email protected]> wrote: > Hi all, > > On Fri, Mar 10, 2017 at 6:55 PM, Lakshman Udayakantha <[email protected]> > wrote: > >> Hi Imesh, >> >> On Fri, Mar 10, 2017 at 3:54 PM, Imesh Gunaratne <[email protected]> wrote: >> >>> Hi Vidura, >>> >>> I think it would be better if we can first move the secure vault code >>> from carbon-kernel repository to the new repository with commit history and >>> then apply the changes you have done. Otherwise, we will loose all history. >>> >> +1 to preserve history. >> >>> >>> I had a chat with Lakshman on this and it seems like he has extracted >>> all secure-vault related code into a new component and sent a PR [1] but it >>> has not been merged. >>> >>> IMO we would need to do following: >>> >>> - First, fix conflicts and merge [1]. This would bring all secure >>> vault related code to a new component/folder. >>> >>> I have solved the conflicts and updated the PR. >> > I am -1 for merging this in kernel master branch because this PR is not > complete and there were couple of changes requested for this. Lakshman had > moved the PR to the new repo as suggested during the code review and it has > been merged in a separate branch [1]. AFAIR we discussed that Vidura could > continue making the fixes as suggested in the review and send the PR to the > branch. Once it is in a done done state, we can move it to the master > branch (this is because once a PR is merged to master branch it will be > released since CI/CD is configured). > > @Imesh: +1 if we can preseve the commits from the kernel and move it to > Carbon-secvault. (if we need to merge the PR then we can merge it in a > separate branch. Currently the PR to kernel is sent to the master branch) > > @Vidura: If the commits can be preserved then please coordinate with > Lakshman. > > >> Thanks, >> Lakshman. >> >>> >>> - Then move above folder to [2] using a PR-X >>> - Once the PR-X is merged, apply your changes on top of it. >>> >>> [1] https://github.com/wso2/carbon-kernel/pull/1266 >>> [2] https://github.com/wso2/carbon-secvault >>> >>> Thanks >>> >>> On Mon, Mar 6, 2017 at 12:15 PM, Niranjan Karunanandham < >>> [email protected]> wrote: >>> >>>> Hi Vidura, >>>> >>>> On Mon, Mar 6, 2017 at 11:52 AM, Imesh Gunaratne <[email protected]> >>>> wrote: >>>> >>>>> On Fri, Mar 3, 2017 at 12:00 PM, Thusitha Thilina Dayaratne < >>>>> [email protected]> wrote: >>>>> >>>>>> Rather than having a separate repo for utils I'll look into the >>>>>> possibility of moving that to a separate component (same level as core) >>>>>> without having cyclic dependencies. If that is possible then we can pack >>>>>> that as a new feature or core feature itself. Otherwise lets move that >>>>>> to a >>>>>> separate repo. >>>>>> >>>>>> Thusitha has done this change in the following PR: >>>>> https://github.com/wso2/carbon-kernel/pull/1318 >>>>> >>>> Once this PR is merged, we need to add the support to provide an API >>>> which can return the current config folder for a particular runtime. >>>> >>>> >>>>> >>>>> >>>>> Thanks >>>>> >>>>> -- >>>>> *Imesh Gunaratne* >>>>> Software Architect >>>>> WSO2 Inc: http://wso2.com >>>>> T: +94 11 214 5345 M: +94 77 374 2057 <+94%2077%20374%202057> >>>>> W: https://medium.com/@imesh TW: @imesh >>>>> lean. enterprise. middleware >>>>> >>>>> >>>> Regards, >>>> Nira >>>> >>>> -- >>>> >>>> >>>> *Niranjan Karunanandham* >>>> Associate Technical Lead - WSO2 Inc. >>>> WSO2 Inc.: http://www.wso2.com >>>> >>>> >>> >>> >>> -- >>> *Imesh Gunaratne* >>> Software Architect >>> WSO2 Inc: http://wso2.com >>> T: +94 11 214 5345 M: +94 77 374 2057 <+94%2077%20374%202057> >>> W: https://medium.com/@imesh TW: @imesh >>> lean. enterprise. middleware >>> >>> >> >> >> -- >> Lakshman Udayakantha >> WSO2 Inc. www.wso2.com >> lean.enterprise.middleware >> Mobile: *0717429601* >> >> > [1] - https://github.com/wso2/carbon-secvault/tree/move-from-kernel > > Regards, > Nira > > -- > > > *Niranjan Karunanandham* > Associate Technical Lead - WSO2 Inc. > WSO2 Inc.: http://www.wso2.com > > -- Best Regards, *Vidura Nanayakkara* Software Engineer Email : [email protected] Mobile : +94 (0) 717 919277 <+94%2071%20791%209277> Web : http://wso2.com Blog : https://medium.com/@viduran <http://wso2.com/> Twitter : http://twitter.com/viduranana LinkedIn : https://lk.linkedin.com/in/vidura-nanayakkara <http://wso2.com/>
_______________________________________________ Architecture mailing list [email protected] https://mail.wso2.org/cgi-bin/mailman/listinfo/architecture
