You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by bh...@apache.org on 2019/05/02 04:51:18 UTC
[hadoop] branch trunk updated: HDDS-1483. Fix getMultipartKey
javadoc. (#790)
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 <di...@gmail.com>
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: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org