Mats, good point, we've not EOL'd the 1.4-rel -> master process so that should happen next time Phil brings it forward. Sorry!
Phil, please add Jozef as a reviewer to the next 1.4-rel -> master merge. Jozef, please make sure your code is correctly merged in that change! Thanks, Nathan -----Original Message----- From: Mats Wichmann [mailto:[email protected]] Sent: Monday, September 10, 2018 10:43 AM To: Heldt-Sheller, Nathan <[email protected]>; Jozef Kralik <[email protected]>; [email protected] Subject: Re: [dev] Call for review On 09/10/2018 11:30 AM, Nathan Heldt-Sheller wrote: > Thanks for these important and well-written patches! And big thanks to > George Nash and Ondrej Tomcik for the thorough code review. > > All 3 patches have been merged to 1.4-rel. > > Jozef, please cherry pick all 3 to master as soon as you have time, to avoid > any extra merge work. > > Thanks again! > > Nathan > merging preserves history better (certainly has cleaner looking graphs) than cherry picking as a cherry pick is a new commit, not the application of an existing commit to a different branch. for the past year plus, we've been doing merges into master of things which have been added to release branches. so merge if possible :) phil had some stuff to help with that, maybe he can share. -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#9934): https://lists.iotivity.org/g/iotivity-dev/message/9934 Mute This Topic: https://lists.iotivity.org/mt/25174791/21656 Group Owner: [email protected] Unsubscribe: https://lists.iotivity.org/g/iotivity-dev/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
