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 up the branches and to then
look at the Git workflow as others suggested.
Lewis

[0]
https://lists.apache.org/thread.html/67e5cdde9c9652ec98bca2705cb1c4bdd253ec9c0966e9b3064c47d8@%3Cdev.joshua.apache.org%3E

On Wed, Sep 20, 2017 at 2:50 AM, <
dev-digest-h...@joshua.incubator.apache.org> wrote:

>
> From: Tommaso Teofili 
> To: "dev@joshua.incubator.apache.org" 
> Cc:
> Bcc:
> Date: Wed, 20 Sep 2017 09:50:29 +
> Subject: merging 7 branch to master
> hi all,
>
> how about :
> - moving the master branch into a 6.x branch
> - merging 7 branch into master
>
> This way we can support 6.1 with bugfixes and minor releases and go ahead
> with development on version 7.
>
> Regards,
> Tommaso
>
>


-- 
http://home.apache.org/~lewismc/
@hectorMcSpector
http://www.linkedin.com/in/lmcgibbney

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 Administrative Office (3010)
> Manager, NSF & Open Source Projects Formulation and Development Offices
> (8212)
> NASA Jet Propulsion Laboratory Pasadena, CA 91109 USA
> Office: 180-503E, Mailstop: 180-503
> Email: chris.a.mattm...@nasa.gov
> WWW:  http://sunset.usc.edu/~mattmann/
> ++
> Director, Information Retrieval and Data Science Group (IRDS)
> Adjunct Associate Professor, Computer Science Department
> University of Southern California, Los Angeles, CA 90089 USA
> WWW: http://irds.usc.edu/
> ++
>
>
> On 9/20/17, 2:50 AM, "Tommaso Teofili"  wrote:
>
> hi all,
>
> how about :
> - moving the master branch into a 6.x branch
> - merging 7 branch into master
>
> This way we can support 6.1 with bugfixes and minor releases and go
> ahead
> with development on version 7.
>
> Regards,
> Tommaso
>
>
>

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, CA 91109 USA
Office: 180-503E, Mailstop: 180-503
Email: chris.a.mattm...@nasa.gov
WWW:  http://sunset.usc.edu/~mattmann/
++
Director, Information Retrieval and Data Science Group (IRDS)
Adjunct Associate Professor, Computer Science Department
University of Southern California, Los Angeles, CA 90089 USA
WWW: http://irds.usc.edu/
++
 

On 9/20/17, 2:50 AM, "Tommaso Teofili"  wrote:

hi all,

how about :
- moving the master branch into a 6.x branch
- merging 7 branch into master

This way we can support 6.1 with bugfixes and minor releases and go ahead
with development on version 7.

Regards,
Tommaso

merging 7 branch to master

2017-09-20 Thread Tommaso Teofili 
hi all,

how about :
- moving the master branch into a 6.x branch
- merging 7 branch into master

This way we can support 6.1 with bugfixes and minor releases and go ahead
with development on version 7.

Regards,
Tommaso