June, More comments in green below. Pat From: ??? [mailto:[email protected]] Sent: Wednesday, December 24, 2014 2:17 AM To: ???; Lankswert, Patrick; Dieter, William R; 'OIC-OSD at lists.01.org'; 'iotivity-dev at lists.iotivity.org'; Shaver, Michael R Cc: 'Brian Warner (brian.warner at linuxfoundation.org)' Subject: RE: RE: Re: [OIC-OSD] Moving 01.org to IoTivity.org
Pat, I have added my comments in blue below. Mike, I think these tag info. on Git Repo. should be after version info. in release note on the Website for users to easily recognize. Do you have any more idea? - Master branch: 0.9.0 - Connectivity Abstraction branch: 0.9.0-CA - Control Manager branch: 0.9.0-CM June Yong Young Principal Engineer Web & Convergence Team, Software R&D Center Samsung Electronics Co.,Ltd. T: +82-31-301-6107, M: +82-10-9530-6107 E-mail :juney at samsung.com ------- Original Message ------- Sender : Lankswert, Patrick<patrick.lankswert at intel.com<mailto:patrick.lankswert at intel.com>> Date : 2014-12-23 01:28 (GMT+09:00) Title : RE: Re: [OIC-OSD] Moving 01.org to IoTivity.org June, All of the branches have been tagged and I can create release branches at your leisure, but there is still a lot of clean up that needs to be done. There is not enough time to vet and merge the three (four?) branches into one branch by this time frame. -> [June] I had thought that the release branch was supposed to be created for the official branch to the public, but if you think it is not possible by this time frame, then let us not make release branch for v0.9.0. However, we should figure out what tag should be added and what to open to the public. [PCL] I agree that we should branch for v0.9.0. I am getting multiple requests to hold for more commits and I do not have the contributions merged to put v0.9.0 all on one branch yet. [June]Could you confirm that you agree that we shoud not create release branch for V0.9.0, but will create new release branch for V0.9.1 soon? [PCL, 12/24/2014] I can create a release branch with any labels that you like at any time that you like. Since a branch can be created before or after tagging, you can release from a tag if you so desired and then create a branch from that tag when master (or other branch) diverges but you need isolated fixes against the tagged version. GIT is very flexible here. Only we have to do for V0.9.0 is just to tag new label(0.9.0 official) for each branch after build script fixes will be included? [PCL, 12/24/2014] Once again, we have Samsung and Intel teams both sending critical fixes around the clock, right now. When this stops and the build machines are building everything cleanly, I can put a label on it. Here the label is an indication of milestone. My current plan is: - Finish bringing up the iotivity build machines. I would like this completed for several of the main projects (resources and some of the services) today. - Start the merge process for one of the branches. This requires review and validation that it does not break existing functionality. -> [June] I think this activity shouldn't be related to V0.9.0 and has to be done regardless of release V0.9.0 in order to maintain main branch immediately after V0.9.0, so let's discuss further later on along with Uze. My suggestion is as follows - Merging all other DEV. branches should be merged on the master branch in prior to release branch. [PCL] Agreed. However, I cannot merge code into master until I am reasonable sure that it will not break currently working functionality. For instance, if a bug in one of the branches breaks several (all?) of the services on master, the release looks bad. [June] Regarding the issues your are worried about, isthere any difference between merging onto release branch and onto master branch at this point? [PCL, 12/24/2014] No, they are equally bad if the code is broken in fundamental ways and particularly, if something that used to work is broken, it damages any member who is building on top of it. - The release to be done as V0.9.1 based on merged branch environments and some fixes. [PCL] That is fine. - This release should be better to be done early next year since end-year activity will be at risk to manage workforces. [PCL] However, if I merge this code prematurely and there are a number of issues AND the workforces shift, we could have NO working branch for the foreseeable future. [June] Regarding the issues your are worried about, is there any difference between merging onto release branch and onto master branch at this point? [PCL, 12/24/2014] See comment above. In the meantime, I am receiving and reviewing patch commits for fixes. I have seen several just this morning. -> [June] As I know, some fixes about build problems are required at present before offical open. I think minimum fixes have to be added. Maybe some branch has to have those fixes and new tag with "RC2" which should be open to the public. Then is it possible to dual tag on the latest snapshot although it has been already tagged or not like below? [PCL] Absolutely and it is not uncommon. However, I *think* that you can only have one of a given name in the repository. So, you can only tag one branch with ?0.9.0? So, the exact same commit can be tagged both ?0.9.0-RC2? and ?0.9.0?, but two branches cannot share a tag ?0.9.0? unless their content is identical. [June] I have revised tag name below. Is this ok for you? - Master branch: 0.9.0-RC2 / 0.9.0 (official) - Connectivity Abstraction branch: 0.9.0-CA-RC1 / 0.9.0-CA (official) - Control Manager branch: 0.9.0-CM-RC2 / 0.9.0-CM (official) BTW, what is your target time to freeze official 0.9.0? Do you perhaps need still more time to merge bug fixes coming out from Intel side? [PCL, 12/24/2014] At this point, I cannot merge Control Manager into master as I wanted. I should have the android port work merged into master by Friday. BTW, I am seeing bug fixes from both Samsung and Intel against master and the connectivity abstraction branch. I have seen AT LEAST 7 patches in the last 9 hours. I expect this clean up to continue through the end of the year. I am happy to put a tag on any intermediate version for release purposes, but I would prefer that we save the official 0.9.0 tag for the snapshot that provides the best developer experience. Pat From: ??? [mailto:[email protected]] Sent: Sunday, December 21, 2014 9:26 PM To: Dieter, William R; Lankswert, Patrick; 'OIC-OSD at lists.01.org'; 'iotivity-dev at lists.iotivity.org' Cc: 'Brian Warner (brian.warner at linuxfoundation.org<mailto:brian.warner at linuxfoundation.org>)' Subject: Re: Re: [OIC-OSD] Moving 01.org to IoTivity.org Pat, William, Thank you for your hard work indeed. BTW, We are supposed to freeze release branch at 12/22 08:00 AM, PST, aren't we? Do you perhaps have any more additional schedule? Regards June June Yong Young Principal Engineer Web & Convergence Team, Software R&D Center Samsung Electronics Co.,Ltd. T: +82-31-301-6107, M: +82-10-9530-6107 E-mail :juney at samsung.com ------- Original Message ------- Sender : Dieter, William R Date : 2014-12-22 05:56 (GMT+09:00) Title : Re: [OIC-OSD] Moving 01.org to IoTivity.org I should also add, thanks to the Linux Foundation support team for helping get everything set up and fast response on the last minute issues. Bill. -----Original Message----- From: iotivity-dev-bounces at lists.iotivity.org<mailto:iotivity-dev-bounces at lists.iotivity.org> [mailto:[email protected]] On Behalf Of Dieter, William R Sent: Sunday, December 21, 2014 3:54 PM To: Lankswert, Patrick; 'OIC-OSD at lists.01.org'; 'iotivity-dev at lists.iotivity.org' Cc: 'Brian Warner (brian.warner at linuxfoundation.org<mailto:brian.warner at linuxfoundation.org>)' Subject: Re: [dev] Moving 01.org to IoTivity.org Here is the current status of the iotivity.org infrastructure: Item URL Status ------- ---------------- ------------- Web www.iotivity.org<http://www.iotivity.org> Up (access controlled with htaccess) Wiki wiki.iotivity.org Up (access controlled via IP whitelist for OIC member companies) Git/Gerrit gerrit.iotivity.org Up (IP whitelist) Jenkins build.iotivity.org Up (IP whitelist) Mailing list lists.iotivity.org Up (open to the whole world) Jira jira.iotivity.org Up (for several weeks) [ ... lots of stuff deleted ... ] _______________________________________________ OIC-OSD mailing list OIC-OSD at lists.01.org<mailto:OIC-OSD at lists.01.org> https://lists.01.org/mailman/listinfo/oic-osd [cid:image001.gif at 01D01F59.DA3D8680] [http://ext.samsung.net/mailcheck/SeenTimeChecker?do=23f8e97eb61f497953f5d56cbf33ada447cecd76697e5f5f87dfe03c47d8dbcb08c5ce1bd480a15cd4a87a1fb2ad96504bea3c1765014a1208cece8541bc14eacf878f9a26ce15a0] -------------- next part -------------- An HTML attachment was scrubbed... URL: <http://lists.iotivity.org/pipermail/iotivity-dev/attachments/20141224/5e8cd270/attachment.html> -------------- next part -------------- A non-text attachment was scrubbed... Name: image001.gif Type: image/gif Size: 13168 bytes Desc: image001.gif URL: <http://lists.iotivity.org/pipermail/iotivity-dev/attachments/20141224/5e8cd270/attachment.gif>
