To align to your idea, it will be better to commit into the release branch one-by-one from IoTivity beginning. I'll decide the best way and execute it from the maintainer point of view.
BR, Uze Choi -----Original Message----- From: Keane, Erich [mailto:[email protected]] Sent: Friday, May 22, 2015 9:12 AM To: uzchoi at samsung.com Cc: Lankswert, Patrick; iotivity-dev at lists.iotivity.org; soonhwang.choi at samsung.com; Mirani, Jawid; juney at samsung.com; Agrawal, Sachin; skykimjh at samsung.com Subject: Re: Re: [dev] 0.9.1 release schedule Still doesn't fix it. It makes the final merge from 0.9.1-dev back into master more difficult. Separate patches get identified as the same one by git so that they dont get re-merged and erase things. Doing it as 1 commit will. On Fri, 2015-05-22 at 09:11 +0900, ???(Uze Choi) wrote: > Master branch point of view, there is no loose change regarding history. > Release branch point of view, I'll add whole history in the commit message > with commit ID. > Thank you for your comment. > > BR, Uze Choi > -----Original Message----- > From: Keane, Erich [mailto:erich.keane at intel.com] > Sent: Friday, May 22, 2015 9:03 AM > To: uzchoi at samsung.com > Cc: Lankswert, Patrick; iotivity-dev at lists.iotivity.org; > soonhwang.choi at samsung.com; Mirani, Jawid; juney at samsung.com; Agrawal, > Sachin; skykimjh at samsung.com > Subject: Re: Re: [dev] 0.9.1 release schedule > > I still do, I'd much prefer to not lose history, otherwise we will have some > pretty terrible times when it comes to merge 0.9.1-dev back into master (like > I did with android-api). > > > On Fri, 2015-05-22 at 08:59 +0900, ???(Uze Choi) wrote: > > Erich, > > > > I see, Then I'll pull from version just before darwin/ios build issues off > > from master and push this code into the 0.9.1 release branch by one commit. > > I expect you may not have a concern. > > > > BR, Uze Choi > > -----Original Message----- > > From: Keane, Erich [mailto:erich.keane at intel.com] > > Sent: Friday, May 22, 2015 8:52 AM > > To: uzchoi at samsung.com > > Cc: Lankswert, Patrick; iotivity-dev at lists.iotivity.org; > > soonhwang.choi at samsung.com; Mirani, Jawid; juney at samsung.com; > > Agrawal, Sachin; skykimjh at samsung.com > > Subject: Re: Re: [dev] 0.9.1 release schedule > > > > I'm quite against it, as I have been the whole time. I would suggest NOT > > doing that entire list and only choosing the ones that are important fixes. > > > > Additionally, I'd choose to leave the darwin/ios build issues off, since > > we're not supporting darwin/ios on the .9.1 release. > > > > Finally, normal git-merges are either not possible in gerrit, or are highly > > discouraged. We got an exception for CA due to its size, but I believe it > > would be unnecessary and unreasonable to expect to do that here. A > > copy&paste merge would be even worse. > > > > On Fri, 2015-05-22 at 08:47 +0900, ???(Uze Choi) wrote: > > > Hi Erich, > > > > > > These are whole list updated after release_0.9.1 branch created. > > > Where is the patch related with feature/spec? most for updates are what I > > > need to update into the release branch. > > > I think we need apply whole these code into master which means > > > branch merging because there is no difference between Cherrypic > > > one-by-one and merging whole change same time in current situation. > > > > > > If there is still objection for branch merging, let me know right now. > > > > > > BR, Uze Choi > > > -----Original Message----- > > > From: Keane, Erich [mailto:erich.keane at intel.com] > > > Sent: Friday, May 22, 2015 7:50 AM > > > To: uzchoi at samsung.com > > > Cc: Lankswert, Patrick; iotivity-dev at lists.iotivity.org; > > > soonhwang.choi at samsung.com; Mirani, Jawid; juney at samsung.com; > > > Agrawal, Sachin; skykimjh at samsung.com > > > Subject: Re: Re: [dev] 0.9.1 release schedule > > > > > > Also: these are the only commits in difference: > > > + 00edd72ebece46be81e947afca414e72fc1acd27 Android Protocol Plugin > > > Manager API merge from android-api branch to master > > > + 81c1963fd6e3bd2a8a7f84931f5d93fad80176a5 Fix to use OC_IPV4 > > > + instead of > > > OC_ALL in Things Manager > > > + d5ac52e365b6059af167308b6966e056b39993f6 Fix for the prevent > > > + issues > > > for Things Manager. > > > + 8432be2dd7a7d006605f33d26954aa6d53120536 Fix for the prevent > > > + issues > > > for Notification Manager. > > > + 6d2db8d93a6664cf8065b90890cafc9003661123 Fix a race problem in > > > con-server application, Things Manager > > > + ce8b38eca80577f4168ae3df2685d634e4600085 Added IoTivity > > > + Primitive > > > Services Programmers guide > > > + e5c64768e55b4c2733eec4889d059202a02f351c Removed IoTivity v0.9.0 > > > Primitive Service documents > > > + 1b02c81e5991d2d637a07429b3b94db71e11762c Fix for the prevent > > > + issue > > > with CID 65911 for Things manager > > > + 887d789ee50b0d2ca5e520d872aeb507ddbd0f31 Update Doxyfile for > > > generating Primitive Service C/C++ API > > > + 027b1c1ade99427ec95a8f734edf9ae37fb96cc5 Prevent fix in > > > + notification > > > manager > > > + 25973756a67448dc33a0b479ae2b6877cee88842 Fix for tizen build > > > + failure > > > issue. > > > + 3f675ba43da518741f67720132efdaa5ecafbc24 Fix darwin/ios build > > > + issues > > > > > > > > > All of the "Fix" ones seem easy enough to pull, as is the remove and > > > update. Only the Protocol Plugin Manager Merge could possibly be any > > > difficult, but if you do it first, you'll have no issues. > > > > > > On Thu, 2015-05-21 at 22:42 +0000, ??? wrote: > > > > Erich > > > > I'm also afraid that lots of these sequential cheery pick > > > > patches may scrub the IoTivity code from your suggestion. > > > > BR Uze Choi > > > > > > > > > > > > ---?? ???--- > > > > ??? : Keane, Erich/erich.keane at intel.com ???? : 2015/05/22 06:54 > > > > (GMT+09:00) ?? : Re: [dev] 0.9.1 release schedule This would not > > > > be a good idea as Master already has a few patches that are > > > > feature/spec related, which we don't want on that branch. > > > > > > > > I suggest being EXTREMELY careful about what you pull over, but > > > > do so via the cherry-pick mechanism. > > > > > > > > -Erich > > > > > > > > On Thu, 2015-05-21 at 21:51 +0000, ??? wrote: > > > > > Pat > > > > > During one or two days there are lots of patch regardins bugfix. > > > > > How about rebasing this release beanch with the latest master > > > > > branch version by git branch merging? > > > > > BR Uze Choi > > > > > > > > > > > > > > > ---?? ???--- > > > > > ??? : Lankswert, Patrick/patrick.lankswert at intel.com > > > > > ???? : 2015/05/22 01:35 (GMT+09:00) ?? : Re: [dev] 0.9.1 > > > > > release schedule June, > > > > > > > > > > > > > > > > > > > > The branch (0.9.1-dev) was created on 5/20. No direct changes > > > > > will > > > > be > > > > > accepted to that branch. Bug fixes for the release should be > > > > > pushed and validated on master and will be cherry picked by a > > > > > maintainer to the release branch. > > > > > > > > > > > > > > > > > > > > We are not calling the branch ?0.9.1-rel? to ensure that no > > > > > one confuses the branch is the actual release. The releases > > > > > will be clearly marked based on the tag names ?0.9.1-rc1?, > > > > > ?0.9.1-rc2?? ?0.9.1?, etc. > > > > > > > > > > > > > > > > > > > > Jawid, > > > > > > > > > > > > > > > > > > > > Test plans may start running. > > > > > > > > > > > > > > > > > > > > Pat > > > > > > > > > > > > > > > > > > > > From: ???(June Yong Young) [mailto:juney at samsung.com] > > > > > Sent: Thursday, May 21, 2015 4:07 AM > > > > > To: Lankswert, Patrick; Agrawal, Sachin; > > > > > iotivity-dev at lists.iotivity.org; '???'; '???' > > > > > Cc: Skarpness, Mark; Mirani, Jawid; Kesavan, Vijay S > > > > > Subject: RE: [dev] 0.9.1 release schedule > > > > > > > > > > > > > > > > > > > > > > > > > Hi Pat, > > > > > > > > > > > > > > > > > > > > After long discussion, I think now we?ve reached a consensus > > > > > to release 0.9.1 within end of May. > > > > > > > > > > So, we are going to release ?0.9.1-RC1?by today (5/20) or > > > > > tomorrow morning. > > > > > > > > > > If you have any concerns, please let us know. > > > > > > > > > > > > > > > > > > > > And ?0.9.1-dev? cannot be modified to ?0.9.1-rel?for now? > > > > > > > > > > > > > > > > > > > > The following schedule is here below. > > > > > > > > > > - Schedule > > > > > > > > > > . 5/20(or 21), Feature complete & Review Complete and make > > > > > "0.9.1-RC1" release to QA > > > > > > > > > > . 5/25, QA reports back. > > > > > > > > > > . 5/26, "0.9.2-RC2" release just in case there is an issue > > > > > occurs on basic functionality > > > > > > > > > > . 5/28, QA to run Sanity check (about only the issue items) > > > > > > > > > > . 5/29, Website Open > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > June Yong Young > > > > > OIC Open Sourece WG Project Planning & Requirement TG Chair > > > > > > > > > > IoTivity Release Function Lead > > > > > > > > > > > > > > > Samsung Electronics Co.,Ltd. > > > > > > > > > > Software R&D Center, IoT Solution Lab. | Web & Convergence > > > > > Team > > > > > > > > > > Principal Engineer > > > > > > > > > > T: +82-31-301-6107, M: +82-10-9530-6107 > > > > > > > > > > E-mail :juney at samsung.com > > > > > > > > > > > > > > > > > > > > From: Lankswert, Patrick [mailto:patrick.lankswert at intel.com] > > > > > Sent: Tuesday, May 19, 2015 10:12 PM > > > > > To: juney at samsung.com; Agrawal, Sachin; > > > > > iotivity-dev at lists.iotivity.org; '???'; '???' > > > > > Cc: Skarpness, Mark; Mirani, Jawid; Kesavan, Vijay S > > > > > Subject: RE: [dev] 0.9.1 release schedule > > > > > > > > > > > > > > > > > > > > > > > > > June, > > > > > > > > > > > > > > > > > > > > Well, this schedule was not shared at the ISG meeting. Your > > > > > cut-offs are before the spec A compliance delivery commit dates. > > > > > We will need to check with Vijay, but I believe that very > > > > > little spec A work will make this release and will not be available > > > > > for the plug fest. > > > > > > > > > > > > > > > > > > > > Can you list the OIC members that are insisting on a May release? > > > > > > > > > > > > > > > > > > > > Pat > > > > > > > > > > > > > > > > > > > > From:???(June Yong Young) [mailto:juney at samsung.com] > > > > > Sent: Monday, May 18, 2015 8:19 PM > > > > > To: Lankswert, Patrick; Agrawal, Sachin; > > > > > iotivity-dev at lists.iotivity.org; '???'; '???' > > > > > Subject: RE: [dev] 0.9.1 release schedule > > > > > > > > > > > > > > > > > > > > > > > > > Hi Pat, > > > > > > > > > > > > > > > > > > > > June 5th release was changed to end of May release in the ISG > > > > meeting > > > > > last week. > > > > > > > > > > It was because there are some OIC member companies to want May > > > > release > > > > > ASAP. > > > > > > > > > > > > > > > > > > > > The following is the meeting minute that Deniel captured. > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > Release process discussion/owners: June and Pat (filling in > > > > > for > > > > > George) > > > > > > > > > > -release types: lightweight, agile-style releases and major > > > > > releases > > > > > > > > > > -release criteria for each release type, including go/no-go > > > > > decision process > > > > > > > > > > -quality criteria for each release type > > > > > > > > > > -process for each type (branch vs tag, expected collateral, > > > > > announcement) > > > > > > > > > > (Resolution) > > > > > > > > > > 1) Release Schedule > > > > > > > > > > May > > > > > > > > > > > > > > > Minor Release > > > > > > > > > > > > > > > Spec-A mandatory > > > > > features(Pre Release) > > > > > > > > > > > > > > > June > > > > > > > > > > > > > > > Plugfest > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > July > > > > > > > > > > > > > > > Minor Release > > > > > > > > > > > > > > > Spec-A compliant > > > > > feature + > > > > > Spec-B(partially) > > > > > > > > > > > > > > > August > > > > > > > > > > > > > > > Plugfest > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > October > > > > > > > > > > > > > > > Major > > > > > > > > > > > > > > > Spec-A/B compliant > > > > > feature > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > Minor > > > > > > > > > > > > > > > Every two month > > > > > > > > > > > > > > > April > > > > > > > > > > October > > > > > > > > > > > > > > > Major > > > > > > > > > > > > > > > Twice a year > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > And the following is what I announced in the IoTivity session > > > > > in > > > > OSWG > > > > > meeting. > > > > > > > > > > > > > > > > > > > > cid:image001.png at 01D09156.D18120A0 > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > June Yong Young > > > > > OIC Open Sourece WG Project Planning & Requirement TG Chair > > > > > > > > > > IoTivity Release Function Lead > > > > > > > > > > > > > > > Samsung Electronics Co.,Ltd. > > > > > > > > > > Software R&D Center, IoT Solution Lab. | Web & Convergence > > > > > Team > > > > > > > > > > Principal Engineer > > > > > > > > > > T: +82-31-301-6107, M: +82-10-9530-6107 > > > > > > > > > > E-mail :juney at samsung.com > > > > > > > > > > > > > > > > > > > > From: Lankswert, Patrick [mailto:patrick.lankswert at intel.com] > > > > > Sent: Monday, May 18, 2015 11:39 PM > > > > > To: juney at samsung.com; Agrawal, Sachin; > > > > > iotivity-dev at lists.iotivity.org; ???; ??? > > > > > Subject: RE: [dev] 0.9.1 release schedule > > > > > > > > > > > > > > > > > > > > > > > > > June, > > > > > > > > > > > > > > > > > > > > The original dates from the ISG meeting were EoMay (May 29th) > > > > > for feature complete and June 5th for code freeze. Why has > > > > > this been changed? > > > > > > > > > > > > > > > > > > > > Pat > > > > > > > > > > > > > > > > > > > > From: JuneYong Young [mailto:juney at samsung.com] > > > > > Sent: Monday, May 18, 2015 2:21 AM > > > > > To: ???; Agrawal, Sachin; Lankswert, Patrick; > > > > > iotivity-dev at lists.iotivity.org;???;??? > > > > > Subject: Re: [dev] 0.9.1 release schedule > > > > > > > > > > > > > > > > > > > > > > > > > To all, > > > > > > > > > > > > > > > > > > > > I've slightly revised some items below after discussion with > > > > > Samsung QA. > > > > > > > > > > > > > > > > > > > > - 0.9.1 : ?Spec vA Mandatory features? > > > > > > > > > > - Schedule > > > > > > > > > > . 5/20, Feature complete & Review Complete and make "0.9.1-RC1" > > > > > release to QA > > > > > > > > > > . 5/25, QA reports back. > > > > > > > > > > . 5/26, "0.9.2-RC2" release just in case there an issue occurs > > > > > on basic functionality > > > > > > > > > > . 5/28, QA to run Sanity check (about only the issue items) > > > > > > > > > > . 5/29, Website Open > > > > > > > > > > - Mandatory items must be completed > > > > > > > > > > . Any basic functionality should be working > > > > > > > > > > . Merge CA(connectivity Abstraction) branch onto one master > > > > > branch > > > > > > > > > > - The items strongly requested, but no gating issues to > > > > > release > > > > > > > > > > . BT/BLE Support, Noti. Manager, Android API > > > > > > > > > > . If any issues related to these items, they will be described > > > > > as known issues. > > > > > > > > > > - QA > > > > > > > > > > . P1 problems to be fixed. > > > > > > > > > > If it is not fixed, then it has to be lowered down to P2 after > > > > > discussion with QA. > > > > > > > > > > > > > > > > > > > > To Pat, > > > > > > > > > > George is a release manangement function counter part of Intel side. > > > > > > > > > > Please check with Intel QA since George is not present now. > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > Regards > > > > > > > > > > June > > > > > > > > > > > > > > > > > > > > June Yong Young > > > > > OIC Open Sourece WG Project Planning & Requirement TG Chair > > > > > > > > > > IoTivity Release Function Lead > > > > > > > > > > > > > > > Samsung Electronics Co.,Ltd. > > > > > > > > > > Software R&D Center, IoT Solution Lab. | Web & Convergence > > > > > Team > > > > > > > > > > Principal Engineer > > > > > > > > > > T: +82-31-301-6107, M: +82-10-9530-6107 > > > > > > > > > > E-mail :juney at samsung.com > > > > > > > > > > > > > > > > > > > > ------- Original Message ------- > > > > > > > > > > Sender : ???<juney at samsung.com> S6(??)/??/IoT Solution > > > > Lab(S/W > > > > > ??)/???? > > > > > > > > > > Date : 2015-05-15 11:40 (GMT+09:00) > > > > > > > > > > Title : [dev] 0.9.1 release schedule > > > > > > > > > > > > > > > > > > > > To all, > > > > > > > > > > > > > > > > > > > > According to the discussion result in the last ISG & OSWG F2F > > > > meeting, > > > > > > > > > > we will release & open 0.9.1 at the end of May with schedule driven. > > > > > > > > > > > > > > > > > > > > So, 0.9.1 will be released based on the following. If any > > > > > questions > > > > or > > > > > concerns, then let us know. > > > > > > > > > > > > > > > > > > > > - 0.9.1 : ?Spec vA Mandatory features? > > > > > > > > > > - Schedule > > > > > > > > > > . 5/22, Feature complete & Review Complete > > > > > > > > > > . 5/28, exit from QA > > > > > > > > > > . 5/29, Website Open > > > > > > > > > > - Mandatory items must be completed > > > > > > > > > > . Merge CA(connectivity Abstraction) branch onto one master > > > > > branch > > > > > > > > > > - The items strongly requested, but no gating issues to > > > > > release > > > > > > > > > > . BT/BLE Support, Noti. Manager, Android API > > > > > > > > > > - QA > > > > > > > > > > . P1 problems to be fixed. > > > > > > > > > > If it is not fixed, then it has to be lowered down to P2 after > > > > > discussion with QA. > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > June Yong Young > > > > > OIC Open Sourece WG Project Planning & Requirement TG Chair > > > > > > > > > > IoTivity Release Function Lead > > > > > > > > > > > > > > > Samsung Electronics Co.,Ltd. > > > > > > > > > > Software R&D Center, IoT Solution Lab. | Web & Convergence > > > > > Team > > > > > > > > > > Principal Engineer > > > > > > > > > > T: +82-31-301-6107, M: +82-10-9530-6107 > > > > > > > > > > E-mail :juney at samsung.com > > > > > > > > > > > > > > > > > > > > From:iotivity-dev-bounces at lists.iotivity.org > > > > > [mailto:iotivity-dev-bounces at lists.iotivity.org] On Behalf Of > > > > Agrawal, > > > > > Sachin > > > > > Sent: Friday, May 15, 2015 8:30 AM > > > > > To: Lankswert, Patrick; iotivity-dev at lists.iotivity.org > > > > > Subject: Re: [dev] Last call for contributions for 0.9.1 > > > > > > > > > > > > > > > > > > > > > > > > > Hi Pat, > > > > > > > > > > > > > > > > > > > > Can you clarify this statement? > > > > > > > > > > ?Failing to do so will result in your contribution being held > > > > > until the next release? > > > > > > > > > > > > > > > > > > > > My assumption is that ?master? will still be open for code > > > > check-ins, > > > > > except that the check-in?s > > > > > > > > > > after May 28th will NOT be tagged for 0.9.1 release. > > > > > > > > > > Is that right? > > > > > > > > > > > > > > > > > > > > Thanks > > > > > > > > > > Sachin > > > > > > > > > > 503-264-8071 > > > > > > > > > > > > > > > > > > > > > > > > > From:iotivity-dev-bounces at lists.iotivity.org > > > > > [mailto:iotivity-dev-bounces at lists.iotivity.org] On Behalf Of > > > > > Lankswert, Patrick > > > > > Sent: Wednesday, May 13, 2015 2:21 PM > > > > > To: iotivity-dev at lists.iotivity.org > > > > > Subject: [dev] Last call for contributions for 0.9.1 > > > > > > > > > > > > > > > > > > > > > > > > > To all, > > > > > > > > > > > > > > > > > > > > The following dates are important for the 0.9.1 release: > > > > > > > > > > June 5th ? Code Freeze > > > > > > > > > > May 28th ? Feature Complete and Review Complete > > > > > > > > > > > > > > > > > > > > It is important that contributions be completed by May 28th, > > > > > so that system testing may start. > > > > > > > > > > > > > > > > > > > > If you have a contribution that you want considered for 0.9.1 > > > > > that > > > > is > > > > > not already in gerrit review, you must announce on this list > > > > > with an estimated date for your submission. Failing to do so > > > > > will result in your contribution being held until the next release. > > > > > > > > > > > > > > > > > > > > We are working on a more formal release schedule process what > > > > > will > > > > be > > > > > published on the wiki. > > > > > > > > > > > > > > > > > > > > Pat > > > > > > > > > > > > > > > > > > > > Patrick Lankswert > > > > > > > > > > Discovery and Connectivity (Core Stack) Maintainer > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > _______________________________________________ > > > > > iotivity-dev mailing list > > > > > iotivity-dev at lists.iotivity.org > > > > > https://lists.iotivity.org/mailman/listinfo/iotivity-dev > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > >
