This is an automated email from the ASF dual-hosted git repository.
bharat pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/hadoop.git
The following commit(s) were added to refs/heads/trunk by this push:
new f682a17 HDDS-1483. Fix getMultipartKey javadoc. (#790)
f682a17 is described below
commit f682a171f59e61ea6bd1b1bed911820789d150f0
Author: dineshchitlangia <[email protected]>
AuthorDate: Thu May 2 00:51:11 2019 -0400
HDDS-1483. Fix getMultipartKey javadoc. (#790)
---
.../src/main/java/org/apache/hadoop/ozone/om/OMMetadataManager.java | 1 -
1 file changed, 1 deletion(-)
diff --git
a/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/OMMetadataManager.java
b/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/OMMetadataManager.java
index 9654419..d484e9d 100644
---
a/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/OMMetadataManager.java
+++
b/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/OMMetadataManager.java
@@ -262,7 +262,6 @@ public interface OMMetadataManager {
Table<byte[], byte[]> getS3Table();
/**
-<<<<<<< HEAD
* Returns the DB key name of a multipart upload key in OM metadata store.
*
* @param volume - volume name
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
