Uploaded image for project: 'Hadoop HDFS'
  1. Hadoop HDFS
  2. HDFS-7285 Erasure Coding Support inside HDFS
  3. HDFS-7936

Erasure coding: resolving conflicts in the branch when merging trunk changes.

Log workAgile BoardRank to TopRank to BottomAttach filesAttach ScreenshotBulk Copy AttachmentsBulk Move AttachmentsVotersWatch issueWatchersConvert to IssueMoveLinkCloneLabelsUpdate Comment AuthorReplace String in CommentUpdate Comment VisibilityDelete Comments
    XMLWordPrintableJSON

Details

    • Sub-task
    • Status: Resolved
    • Major
    • Resolution: Fixed
    • None
    • HDFS-7285
    • None
    • None
    • Reviewed

    Description

      This will be used to track and resolve conflicts when merging trunk changes.

      Below is a list of trunk changes that have caused conflicts (updated weekly):

      1. HDFS-7903
      2. HDFS-7435
      3. HDFS-7930
      4. HDFS-7960
      5. HDFS-7742
      6. HDFS-8035
      7. HDFS-8169
      8. HDFS-8327
      9. HDFS-8357

      Attachments

        1. HDFS-7936-001.patch
          6 kB
          Zhe Zhang
        2. HDFS-7936-002.patch
          6 kB
          Zhe Zhang
        3. HDFS-7936-003.patch
          4 kB
          Zhe Zhang
        4. HDFS-7936-004.patch
          3 kB
          Zhe Zhang
        5. HDFS-7936-005.patch
          3 kB
          Zhe Zhang

        Activity
          This comment will be Viewable by All Users Viewable by All Users
          Cancel

          People

            zhz Zhe Zhang Assign to me
            zhz Zhe Zhang
            Votes:
            0 Vote for this issue
            Watchers:
            4 Start watching this issue

            Dates

              Created:
              Updated:
              Resolved:

              Slack

                Issue deployment