Uploaded image for project: 'CXF'
  1. CXF
  2. CXF-4483

apache-cxf feature has a merge conflict

    Details

    • Type: Bug
    • Status: Closed
    • Priority: 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

        Attachments

          Activity

            People

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

              Dates

              • Created:
                Updated:
                Resolved: