I have just accepted the pull request. Thanks everyone for making it happen.
Miha, Last request - could you please change the text "Capstan, a tool for packaging and running your application on OSv. http://osv.io/capstan/"; to something like this:"This capstan repository is no longer maintained! The newest version can be found at "https://github.com/cloudius-systems/capstan""; This should help with any confusion. Thanks, Waldek On Thursday, March 28, 2019 at 3:12:38 AM UTC-4, Miha Plesko wrote: > > > Hi, > > what you suggest sounds good. Another approach would be as you say to just > open a pull request > and then click the big green button in the browser. I created one just > now, if you want you can > just click the "Merge" button and we're done: > > https://github.com/cloudius-systems/capstan/pull/174 > > Regards, > Miha > > > > ------------------------------ > *From: *"Pekka Enberg" <[email protected] <javascript:>> > *To: *"Waldek Kozaczuk" <[email protected] <javascript:>> > *Cc: *"Gregor Berginc" <[email protected] <javascript:>>, "Dor Laor" < > [email protected] <javascript:>>, "Miha Plesko" <[email protected] > <javascript:>>, "OSv Development" <[email protected] <javascript:>> > *Sent: *Thursday, March 28, 2019 6:59:07 AM > *Subject: *Re: [osv-dev] Capstan > > Hello, > > On Thu, Mar 28, 2019 at 3:20 AM Waldek Kozaczuk <[email protected] > <javascript:>> wrote: > >> All, >> >> Please let me know if you think it is NOT a good idea to merge back >> capstan repo back to cloudius-systems/capstan. Otherwise I propose we do so. >> >> I have never done such a merge on github. If anybody has any suggestions >> what the best procedure it should be let me know. I would obviously need a >> permission to do os. Create a merge request? >> >> Also I hope there are no licencing issues with merging up all the content >> up. Should we retain some Mikelangelo project references? >> > > I would just do a "git pull" since there are no conflicts: > > [penberg@nero ~]$ git clone [email protected]:cloudius-systems/capstan.git > Cloning into 'capstan'... > remote: Enumerating objects: 1774, done. > remote: Total 1774 (delta 0), reused 0 (delta 0), pack-reused 1774 > Receiving objects: 100% (1774/1774), 329.55 KiB | 1.28 MiB/s, done. > Resolving deltas: 100% (1019/1019), done. > > [penberg@nero ~]$ cd capstan/ > [penberg@nero capstan]$ git pull > https://github.com/mikelangelo-project/capstan.git master > remote: Enumerating objects: 143, done. > remote: Counting objects: 100% (143/143), done. > remote: Total 1401 (delta 142), reused 142 (delta 142), pack-reused 1258 > Receiving objects: 100% (1401/1401), 509.60 KiB | 1.38 MiB/s, done. > Resolving deltas: 100% (873/873), completed with 32 local objects. > From https://github.com/mikelangelo-project/capstan > * branch master -> FETCH_HEAD > Updating 47fff91..5af44b4 > > The "git push", of course. Anything that needs to be addressed can be > fixed incrementally. > > There are no licensing concerns because all the modifications are > contributed under the same license. Please *do* keep the Mikelangelo > references since they are part of the development history. > > - Pekka > > -- You received this message because you are subscribed to the Google Groups "OSv Development" group. To unsubscribe from this group and stop receiving emails from it, send an email to [email protected]. For more options, visit https://groups.google.com/d/optout.
