CXF
  1. CXF
  2. CXF-4483

apache-cxf feature has a merge conflict

    Details

    • Type: Bug Bug
    • Status: Closed
    • Priority: Major Major
    • Resolution: Fixed
    • Affects Version/s: 2.5.5
    • Fix Version/s: 2.5.6
    • Component/s: OSGi
    • Labels:
      None
    • Estimated Complexity:
      Unknown

      Description

      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

        Activity

        Willem Jiang created issue -
        Hide
        Willem Jiang added a comment -

        The patch is applied into cxf-2.5.x branch in reversion 1376006[1]
        [1]http://svn.apache.org/viewvc?rev=1376006&view=rev

        Show
        Willem Jiang added a comment - The patch is applied into cxf-2.5.x branch in reversion 1376006 [1] [1] http://svn.apache.org/viewvc?rev=1376006&view=rev
        Willem Jiang made changes -
        Field Original Value New Value
        Status Open [ 1 ] Resolved [ 5 ]
        Resolution Fixed [ 1 ]
        Daniel Kulp made changes -
        Status Resolved [ 5 ] Closed [ 6 ]

          People

          • Assignee:
            Willem Jiang
            Reporter:
            Willem Jiang
          • Votes:
            0 Vote for this issue
            Watchers:
            1 Start watching this issue

            Dates

            • Created:
              Updated:
              Resolved:

              Development