The merge path will merge tp31 to tp32 and then tp32 to master. I don't think there will be a lot of merge conflicts with your PR so I think we can probably handle it all on our end after review. If we have problems we will let you know. Thanks.
On Mon, Jun 19, 2017 at 8:15 AM, Sheldon Hall <shel...@grakn.ai> wrote: > OK thanks for letting me know. I also checked the latest master on github > and it looks like the issue is still there. Just let me know if you want me > to submit a pr to any other branches. > > > On 19 Jun 2017, at 12:15, Stephen Mallette <spmalle...@gmail.com> wrote: > > > > Thank you for submitting that patch and you did submit it to the right > > place if you want the 3.1.x line. You just missed the cut-off for 3.1.7 > > which will release in a the next day or so, therefore you would see the > fix > > on 3.1.8. There is no plan for a release date for that at this point, but > > we usually release every two to three months so that should give you a > > rough idea to work with. > > > > On Mon, Jun 19, 2017 at 6:49 AM, Sheldon Hall <shel...@grakn.ai> wrote: > > > >> Hi, > >> > >> We have been depending on 3.1.1-incubating here at Grakn for a while > now, > >> but I am hoping to get a bug fix into the main repo to help with our > >> testing. I have submitted a pr to the branch tp31 ( > >> https://issues.apache.org/jira/browse/TINKERPOP-1519) assuming that it > is > >> the continuation of 3.1.1-incubating. If the bug fix is accepted, I am > not > >> sure which version it will end up in and therefore what I might need to > >> upgrade my dependencies to. Could anyone help me understand what will > >> happen next? In the meantime I will probably deploy a fork to maven to > get > >> things up and running faster. > >> > >> Thanks, > >> > >> Sheldon > >> > >
