[ https://issues.apache.org/jira/browse/JOSHUA-332?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=16219517#comment-16219517 ]
Lewis John McGibbney commented on JOSHUA-332: --------------------------------------------- [~teofili] I see that your recent [link mailing list discussion|https://lists.apache.org/thread.html/b43cdffd8f3ea7b7c70929eed4aaa989af31bcdc5b5e8320ff412dd4@%3Cdev.joshua.apache.org%3E] may have not been resolved yet. Is this preventing the replacement of current master with 7 branch? Thanks > Merge 7 branch into master > --------------------------- > > Key: JOSHUA-332 > URL: https://issues.apache.org/jira/browse/JOSHUA-332 > Project: Joshua > Issue Type: Task > Components: core > Reporter: Tommaso Teofili > Assignee: Tommaso Teofili > Fix For: 7 > > > As discussed on the mailing list, let's branch _master_ into a _6x_ branch > and merge branch _7_ into _master_ in order to keep developing on top of the > latest in the main branch. -- This message was sent by Atlassian JIRA (v6.4.14#64029)