[
https://issues.apache.org/jira/browse/FALCON-1388?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
]
Paul Isaychuk updated FALCON-1388:
----------------------------------
Attachment: FALCON-1388.diff
> Fix merge conflicts produced by FALCON-1002
> -------------------------------------------
>
> Key: FALCON-1388
> URL: https://issues.apache.org/jira/browse/FALCON-1388
> Project: Falcon
> Issue Type: Bug
> Components: merlin
> Affects Versions: 0.6.1
> Reporter: Paul Isaychuk
> Assignee: Paul Isaychuk
> Priority: Blocker
> Fix For: 0.7
>
> Attachments: FALCON-1388.diff
>
>
> FALCON-1002 produced few merge conflicts thus falcon-regression build fails.
--
This message was sent by Atlassian JIRA
(v6.3.4#6332)
