Uploaded image for project: 'Hadoop YARN'
  1. Hadoop YARN
  2. YARN-2968

yarn shell script has unresolved merge conflicts in checkin

    XMLWordPrintableJSON

Details

    • Bug
    • Status: Resolved
    • Blocker
    • Resolution: Not A Problem
    • None
    • None
    • None
    • None

    Description

      in the branch-2 yarn command has unresolved merge conflicts
      https://github.com/apache/hadoop/blob/branch-2/hadoop-yarn-project/hadoop-yarn/bin/yarn

      commit - aadd0c392be66080f

      see line 203, 106

      Attachments

        Issue Links

          Activity

            People

              Unassigned Unassigned
              pramachandran Prakash Ramachandran
              Votes:
              0 Vote for this issue
              Watchers:
              6 Start watching this issue

              Dates

                Created:
                Updated:
                Resolved: