Home Explore Help
Register Sign In
liuzhangxing
/
hadoop
forked from apache/hadoop
1
0
Fork 0
Files
Browse Source

HDDS-1483. Fix getMultipartKey javadoc. (#790)

dineshchitlangia 6 years ago
parent
7cb46f035a
commit
f682a171f5
1 changed files with 0 additions and 1 deletions
Unified View Show Diff Stats
  1. 0 1
      hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/OMMetadataManager.java

+ 0 - 1
hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/OMMetadataManager.java
View File 

@@ -262,7 +262,6 @@ public interface OMMetadataManager {
 
   Table<byte[], byte[]> getS3Table();
 
   Table<byte[], byte[]> getS3Table();
 
 
 
   /**
 
   /**
 
-<<<<<<< HEAD
 
    * Returns the DB key name of a multipart upload key in OM metadata store.
 
    * Returns the DB key name of a multipart upload key in OM metadata store.
 
    *
 
    *
 
    * @param volume - volume name
 
    * @param volume - volume name