Re: merging 7 branch to master

2017-10-01 Thread Tommaso Teofili
I've created a 6x branch from master, now I am going through the pain of trying to reconcile all the conflicts between current master and 7 branch before pushing the merge to master. I'll let you know how it goes later this week. Regards, Tommaso Il giorno lun 25 set 2017 alle ore 14:13 Tommaso

Re: merging 7 branch to master

2017-09-25 Thread Tommaso Teofili
Il giorno gio 21 set 2017 alle ore 06:34 lewis john mcgibbney < lewi...@apache.org> ha scritto: > Hi Tommaso, > > I'm +1 to this. From my previous thread on the topic as well [0] I've seen > nothing which did not support making 7.X as master. > Do you want to go ahead and do this Tommaso? Also,

Re: merging 7 branch to master

2017-09-20 Thread lewis john mcgibbney
Hi Tommaso, I'm +1 to this. From my previous thread on the topic as well [0] I've seen nothing which did not support making 7.X as master. Do you want to go ahead and do this Tommaso? Also, do you want to take a merging JOSHUA-209 into the new master? After that is done, we can go ahead and clean

Re: merging 7 branch to master

2017-09-20 Thread kellen sunderland
Sounds like a good plan to me as well. +1 On Sep 20, 2017 8:05 PM, "Mattmann, Chris A (3010)" < chris.a.mattm...@jpl.nasa.gov> wrote: > +1 from me! > > ++ > Chris Mattmann, Ph.D. > Principal Data Scientist, Engineering

Re: merging 7 branch to master

2017-09-20 Thread Mattmann, Chris A (3010)
+1 from me! ++ Chris Mattmann, Ph.D. Principal Data Scientist, Engineering Administrative Office (3010) Manager, NSF & Open Source Projects Formulation and Development Offices (8212) NASA Jet Propulsion Laboratory Pasadena,