cxf-issues mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From "Willem Jiang (JIRA)" <j...@apache.org>
Subject [jira] [Commented] (CXF-4483) apache-cxf feature has a merge conflict
Date Wed, 22 Aug 2012 13:06:38 GMT

    [ https://issues.apache.org/jira/browse/CXF-4483?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=13439471#comment-13439471
] 

Willem Jiang commented on CXF-4483:
-----------------------------------

The patch is applied into cxf-2.5.x branch in reversion 1376006[1]
[1]http://svn.apache.org/viewvc?rev=1376006&view=rev
                
> apache-cxf feature has a merge conflict
> ---------------------------------------
>
>                 Key: CXF-4483
>                 URL: https://issues.apache.org/jira/browse/CXF-4483
>             Project: CXF
>          Issue Type: Bug
>          Components: OSGi
>    Affects Versions: 2.5.5
>            Reporter: Willem Jiang
>            Assignee: Willem Jiang
>             Fix For: 2.5.6
>
>
> There is merge conflict which is introduced by a cherry-pick method ago in the apache-cxf
features.xml.
>    Merged revisions 1363941 via  git cherry-pick from
>     https://svn.apache.org/repos/asf/cxf/branches/2.6.x-fixes

--
This message is automatically generated by JIRA.
If you think it was sent incorrectly, please contact your JIRA administrators: https://issues.apache.org/jira/secure/ContactAdministrators!default.jspa
For more information on JIRA, see: http://www.atlassian.com/software/jira

        

Mime
View raw message