[ https://issues.apache.org/jira/browse/ATLAS-2464?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=16493277#comment-16493277 ]
Nigel Jones commented on ATLAS-2464: ------------------------------------ I wasn't able to apply the 2464_24_05 patch on top of current master using git am: 09:57 $ git am < ~/src/patches/omasMay29/ATLAS-2464_24_05.patch Applying: ATLAS-2464 - omas information view and small omrs changes error: patch failed: omas-assetconsumer/src/main/java/org/apache/atlas/omas/assetconsumer/server/AssetConsumerRESTServices.java:32 error: omas-assetconsumer/src/main/java/org/apache/atlas/omas/assetconsumer/server/AssetConsumerRESTServices.java: patch does not apply .git/rebase-apply/patch:1116: new blank line at EOF. + .git/rebase-apply/patch:2860: new blank line at EOF. + Patch failed at 0001 ATLAS-2464 - omas information view and small omrs changes Use 'git am --show-current-patch' to see the failed patch When you have resolved this problem, run "git am --continue". If you prefer to skip this patch, run "git am --skip" instead. To restore the original branch and stop patching, run "git am --abort". However, the patch did apply using the native intellij patcher > Information View OMAS Listener > ------------------------------ > > Key: ATLAS-2464 > URL: https://issues.apache.org/jira/browse/ATLAS-2464 > Project: Atlas > Issue Type: Sub-task > Reporter: Maryna Strelchuk > Assignee: Ruxandra Rosu > Priority: Major > Attachments: 0001-IV-OMAS-initial-patch-08.05.patch, > ATLAS-2464_24_05.patch, initial_patch_iv.patch > > -- This message was sent by Atlassian JIRA (v7.6.3#76005)