Uploaded image for project: 'HBase'
  1. HBase
  2. HBASE-7290 Online snapshots
  3. HBASE-7753

[snapshot 130201 merge] Fix unresolved merge conflicts

    XMLWordPrintableJSON

    Details

    • Type: Sub-task
    • Status: Closed
    • Priority: Major
    • Resolution: Fixed
    • Affects Version/s: None
    • Fix Version/s: 0.95.0
    • Component/s: None
    • Labels:
      None
    • Hadoop Flags:
      Reviewed

      Description

      Found the following in HRegionServer.java:

      <<<<<<< HEAD
         * @return result to return to client if default operation should be
         * bypassed as indicated by RegionObserver, null otherwise
      =======
         * @return the Result
      >>>>>>> apache/trunk
      

      In ProtobufUtil.java:

      <<<<<<< HEAD
         * @return protocol buffer DeleteType
      =======
         * @return a DeleteType
      >>>>>>> apache/trunk
      

      And in HRegion.java:

      <<<<<<< HEAD
      =======
         * @see HRegion#batchMutate(Pair[])
      >>>>>>> apache/trunk
         */
        public OperationStatus[] put(Put[] puts) throws IOException {
      

      Since the above is in javadoc, it doesn't affect compilation.

        Attachments

        1. 7753.txt
          2 kB
          Ted Yu
        2. 7753-v2.txt
          2 kB
          Ted Yu

          Activity

            People

            • Assignee:
              yuzhihong@gmail.com Ted Yu
              Reporter:
              yuzhihong@gmail.com Ted Yu
            • Votes:
              0 Vote for this issue
              Watchers:
              3 Start watching this issue

              Dates

              • Created:
                Updated:
                Resolved: